--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/member/OrganMemberListVO.java

@@ -2,6 +2,9 @@ package com.zrqx.core.vo.member.bg.member;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -18,7 +21,7 @@ public class OrganMemberListVO {
 	@ApiModelProperty(value = "类型：1正式，2试用")
 	private Integer type;
 	@ApiModelProperty("创建时间")
-	private String createTime;
+	private Date createTime;
 	@ApiModelProperty(value = "到期时间")
-	private String endTime;
+	private Date endTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/member/PMemberVO.java

@@ -13,6 +13,8 @@ public class PMemberVO {
 	private String account;
 	@ApiModelProperty("昵称")
 	private String nickName;
+	@ApiModelProperty("密码")
+	private String password;
 	@ApiModelProperty("手机号")
 	private String phone;
 	@ApiModelProperty("用户状态 0 禁用 1启用")