Merge branch 'dev' into wr_2023_business

# Conflicts:
#	lib/mine/user_info_page.dart

lib/mine/user_info_page.dart

@@ -45,12 +45,12 @@ class _UserInfoPage extends State<UserInfoPage> {
           print(value.getString('user')),
           user = UserInfo.fromJson(jsonDecode(value.getString('user'))),
           mobile = user?.phone ?? "",
-          modifyInfo["nickname"] = user?.nickname ?? "",
+          modifyInfo["nickname"] = user?.nickname ??"",
           modifyInfo["signature"] = user?.signature ?? "",
           modifyInfo["birth"] = user?.birth ?? "",
           modifyInfo["headimg"] = user?.headimg ?? "",
           modifyInfo["sex"] = user?.sex ?? "",
-          age = AppUtils.getAgeByString(user?.birth ?? ""),
+          age = AppUtils.getAgeByString(user ?.birth ?? ""),
           refresh(),
           apiService = ApiService(Dio(),
               context: context, token: value.getString('token')),