兼容数据参数

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -178,6 +178,9 @@ public class UserController extends AppBaseController {
                 throw new BaseException("此用户所属公司不存在或已停用");
             }
 
+            if (StringUtils.isNotEmpty(param.getAppid())){
+                param.setAppid(param.getAppId());
+            }
             if (StringUtils.isNotEmpty(company.getCourseMiniAppId()) && !company.getCourseMiniAppId().equals(param.getAppid())){
                 return R.error("登录用户不属于该小程序");
             }

fs-company-app/src/main/java/com/fs/app/param/LoginParam.java

@@ -16,4 +16,6 @@ public class LoginParam {
     private String jpushId;
 
     private String appid;
+
+    private String appId;
 }

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -150,7 +150,11 @@ public class UserController extends  AppBaseController {
         FsUser user=new FsUser();
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
-        user.setNickName(param.getNickname());
+        if (StringUtils.isNotEmpty(param.getNickname())){
+            user.setNickName(param.getNickname());
+        }else {
+            user.setNickName(param.getNickName());
+        }
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }

fs-user-app/src/main/java/com/fs/app/param/FsUserEditParam.java

@@ -10,9 +10,10 @@ import java.io.Serializable;
 @Setter
 public class FsUserEditParam implements Serializable {
 
-    @NotNull(message = "用户昵称不能为空！")
     private String nickname;
 
+    private String nickName;
+
     //    @NotBlank(message = "用户头像不能为空！")
     private String avatar;