Merge branch 'master' of http://adicom-hxx.natapp1.cc/CQ_ADI/airopt-manager

adi-admin/src/main/java/com/adi/airopt/controller/UserController.java

@@ -158,7 +158,7 @@ public class UserController extends BaseController {
         bodys.put("transCode","B00033");
         bodys.put("userId",airConfig.getUserId());
         bodys.put("uid",user.getUid());
-        bodys.put("nickName",user.getNickName());
+        bodys.put("nickName",user.getNickname());
         bodys.put("username",user.getUsername());
         bodys.put("mobileNo",user.getMobileNo());
         bodys.put("headProfile",user.getHeadProfile());

adi-admin/src/main/java/com/adi/airopt/vo/AiroptUser.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 public class AiroptUser {
 
     private String uid;
-    private String nickName;
+    private String nickname;
     private String username;
     private String mobileNo;
     private String headProfile;
@@ -28,12 +28,12 @@ public class AiroptUser {
     }
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName() {
-        return nickName;
+    public String getNickname() {
+        return nickname;
     }
 
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")