revert: nikename and nikeName

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

@@ -201,7 +201,7 @@ public class UserController extends  AppBaseController {
     public R editUser(@RequestBody @Valid FsUserEditParam param, HttpServletRequest request){
         param.setUserId(Long.parseLong(getUserId()));
         log.info("【修改用户头像昵称】：{}",param);
-        if (param.getNickName().length()>50){
+        if (param.getNickname().length()>50){
             return R.error("请授权正确的昵称！");
         }
         if (StringUtils.isEmpty(param.getAvatar())){
@@ -211,7 +211,7 @@ public class UserController extends  AppBaseController {
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
         // 前端传了nickname 和 nickName 但是只有nickName是正确的
-        user.setNickName(StringUtils.isNotEmpty(param.getNickName())?param.getNickName():param.getNickName());
+        user.setNickName(StringUtils.isNotEmpty(param.getNickName())?param.getNickName():param.getNickname());
         if (ObjectUtils.isNotEmpty(param.getIsWeixinAuth())){
             user.setIsWeixinAuth(param.getIsWeixinAuth());
         }

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

@@ -12,13 +12,13 @@ import java.io.Serializable;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class FsUserEditParam implements Serializable {
-//    @NotNull(message = "用户昵称不能为空！")
-//    @JsonAlias("nickname")
-//    private String nickname;
+    @NotNull(message = "用户昵称不能为空！")
+    @JsonAlias("nickname")
+    private String nickname;
 
     //    @NotBlank(message = "用户头像不能为空！")
     private String avatar;
-    @NotNull(message = "用户昵称不能为空！")
+
     @JsonAlias("nickName")
     private String nickName;
 
@@ -26,13 +26,13 @@ public class FsUserEditParam implements Serializable {
     private Integer isWeixinAuth;
 
 
-//    public @NotNull(message = "用户昵称不能为空！") String getNickname() {
-//        return nickname;
-//    }
-//
-//    public void setNickname(@NotNull(message = "用户昵称不能为空！") String nickname) {
-//        this.nickname = nickname;
-//    }
+    public @NotNull(message = "用户昵称不能为空！") String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(@NotNull(message = "用户昵称不能为空！") String nickname) {
+        this.nickname = nickname;
+    }
 
     public String getAvatar() {
         return avatar;
@@ -66,14 +66,14 @@ public class FsUserEditParam implements Serializable {
         this.isWeixinAuth = isWeixinAuth;
     }
 
-//    @Override
-//    public String toString() {
-//        return "FsUserEditParam{" +
-//                "nickname='" + nickname + '\'' +
-//                ", avatar='" + avatar + '\'' +
-//                ", nickName='" + nickName + '\'' +
-//                ", userId=" + userId +
-//                ", isWeixinAuth=" + isWeixinAuth +
-//                '}';
-//    }
+    @Override
+    public String toString() {
+        return "FsUserEditParam{" +
+                "nickname='" + nickname + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", userId=" + userId +
+                ", isWeixinAuth=" + isWeixinAuth +
+                '}';
+    }
 }