--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/emember/SaveEMemberForm.java

@@ -5,8 +5,13 @@ import javax.validation.constraints.NotNull;
 import com.zrqx.core.form.member.bg.member.SaveMemberForm;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class SaveEMemberForm extends SaveMemberForm{
 	@ApiModelProperty("头像地址")
 	private String img;

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/member/QueryMemberForm.java

@@ -12,9 +12,9 @@ public class QueryMemberForm {
 	@ApiModelProperty(value = "手机号")
 	private String phone;
 	@NotNull(message = "用户类别不能为空：0 普通用户，1专家用户")
-	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")
+	@ApiModelProperty("用户类别：0 普通用户，1专家用户")
 	private Integer level;
-	@ApiModelProperty(value = "用户状态")
+	@ApiModelProperty(value = "用户状态 0 禁用 1启用")
 	private Integer status;
 	@ApiModelProperty(value = "注册时间-开始日期")
 	private String beginTime;

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/member/SaveEMemberForm.java

-package com.zrqx.core.form.member.bg.member;
-
-import javax.validation.constraints.NotNull;
-
-import com.zrqx.core.form.member.bg.member.SaveMemberForm;
-
-import io.swagger.annotations.ApiModelProperty;
-
-
-public class SaveEMemberForm extends SaveMemberForm{
-	@ApiModelProperty("头像地址")
-	private String img;
-	@ApiModelProperty("作者id/医家id")
-	@NotNull(message="作者id/医家id 不能为空！")
-	private Integer authorId;
-}
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/member/SavePMemberForm.java

-package com.zrqx.core.form.member.bg.member;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class SavePMemberForm {
-	@ApiModelProperty("会员id，新增时不需填写")
-	private Integer id;
-	@ApiModelProperty("会员账号")
-	private String account;
-	@ApiModelProperty("昵称")
-	private String nickName;
-	@ApiModelProperty("密码")
-	private String password;
-	@ApiModelProperty("手机号")
-	private String phone;
-	@ApiModelProperty("邮箱")
-	private String email;
-	@ApiModelProperty("用户状态 0 禁用 1启用")
-	private Integer status;
-	@ApiModelProperty("备注")
-	private String remark;
-}
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/pmember/SavePMemberForm.java

@@ -5,9 +5,11 @@ import com.zrqx.core.form.member.bg.member.SaveMemberForm;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Data
-@EqualsAndHashCode(callSuper=false)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class SavePMemberForm extends SaveMemberForm{
 	@ApiModelProperty("真实姓名")
 	private String name;