Merge remote-tracking branch 'origin/master'

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -13,7 +13,6 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -99,6 +98,9 @@ public class UserInfoDto {
     @Accessors(chain = true)
     public static class Update {
 
+        @ApiModelProperty(value = "备注（暂时只有客服用到）")
+        private String remark;
+
         @ApiModelProperty(value = "登录名")
         private String account;
 
@@ -241,7 +243,7 @@ public class UserInfoDto {
 
     @Data
     @Accessors(chain = true)
-    public static class UpdateByWechat{
+    public static class UpdateByWechat {
         @NotNull(message = "用户ID不能为空")
         @ApiModelProperty(value = "id")
         private Long userId;
@@ -258,7 +260,7 @@ public class UserInfoDto {
 
     @Data
     @Accessors(chain = true)
-    public static class UpdateByAli{
+    public static class UpdateByAli {
         @NotNull(message = "用户ID不能为空")
         @ApiModelProperty(value = "id")
         private Long userId;