Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/vo/UserSaveVO.java

@@ -1,10 +1,10 @@
 package com.diagbot.vo;
 
-import com.diagbot.entity.User;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 /**
  * @Description: 图片验证码验证输入信息
@@ -13,11 +13,25 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class UserSaveVO extends User{
+public class UserSaveVO {
+    private Long id;
+    private String isDeleted;
+    private Date gmtCreate;
+    private Date gmtModified;
+    private String creator;
+    private String modifier;
+    private String password;
+    @NotBlank(message = "请输入手机号!")
+    private String username;
+    @NotBlank(message = "请输入机构名称!")
+    private String organization;
+    private String linkman;
+    @NotBlank(message = "请输入邮箱!")
+    private String email; //邮箱
     //图片验证码唯一标志
     @NotBlank(message = "图片验证码唯一标志不能为空!")
     private String imgId;
     //验证码
-    @NotBlank(message = "验证码不能为空!")
+    @NotBlank(message = "请输入图形验证码!")
     private String code;
 }