--no commit message

app/member/src/main/java/com/zrqx/member/commons/form/fg/permissions/LoginMemberInfo.java

-package com.zrqx.member.commons.form.fg.permissions;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "LoginMemberInfo", description = "用户登录信息")
-public class LoginMemberInfo {
-	@ApiModelProperty("会员id")
-	private Integer id;
-	@ApiModelProperty("会员账号")
-	private String account;
-	@ApiModelProperty("昵称")
-	private String nickName;
-	@ApiModelProperty("真实姓名")
-	private String name;
-	@ApiModelProperty("手机号")
-	private String phone;
-	@ApiModelProperty("性别")
-	private String sex;
-	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")
-	private Integer level;
-	@ApiModelProperty("用户状态 0 禁用 1启用")
-	private Integer status;
-	@ApiModelProperty("头像地址")
-	private String img;
-	@ApiModelProperty("作者id/医家id")
-	private String authorId;
-	@ApiModelProperty("机构用户所属机构id")
-	private Integer organId;
-	@ApiModelProperty("微信Key")
-	private String wechatKey;
-	@ApiModelProperty("qqKey")
-	private String qqKey;
-	@ApiModelProperty("token")
-	private String token;
-	@ApiModelProperty("关联资源分类（机构用户）")
-	private String relatedResourceTypes;
-}

app/member/src/main/java/com/zrqx/member/commons/model/PersonalMember.java

 package com.zrqx.member.commons.model;
 
+import java.util.Date;
+
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -28,5 +30,11 @@ public class PersonalMember {
 	private Integer sex;
 	@ApiModelProperty("头像地址")
 	private String img;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
+	@ApiModelProperty("vip类型id")
+	private Integer vipId;
+	@ApiModelProperty("vip会员结束日期")
+	private Date endTime;
 
 }

app/member/src/main/java/com/zrqx/member/commons/model/Vip.java

+package com.zrqx.member.commons.model;
+
+import java.math.BigDecimal;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "m_vip")
+@ApiModel(value = "Vip", description = "vip用户")
+public class Vip {
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty(value = "ID")
+	private Integer id;
+	@ApiModelProperty(value = "会员类型", required = true)
+	private String name;
+	@ApiModelProperty(value = "有效期", required = true)
+	private Integer time;
+	@ApiModelProperty(value = "排序号", required = true)
+	private Integer orderNum;
+	@ApiModelProperty(value = "简介")
+	private String intro;
+	@ApiModelProperty(value = "定价")
+	private BigDecimal price;
+	@ApiModelProperty(value = "售价", required = true)
+	private BigDecimal sellprice;
+	@ApiModelProperty(value = "会员状态 1启用 0禁用", required = true)
+	private Integer status;
+	
+	@Transient
+	@ApiModelProperty(value = "会员数量")
+	private Integer memberNum;
+
+}

app/member/src/main/java/com/zrqx/member/commons/vo/bg/member/MemberListVO.java

@@ -17,4 +17,8 @@ public class MemberListVO {
 	private Integer status;
 	@ApiModelProperty("创建时间")
 	private Date createTime;
+	@ApiModelProperty("VIP到期时间")
+	private Date endTime;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
 }

app/member/src/main/java/com/zrqx/member/commons/vo/fg/personalcenter/MemberInfo.java

 package com.zrqx.member.commons.vo.fg.personalcenter;
 
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,6 +41,10 @@ public class MemberInfo {
 	private Integer version;
 	@ApiModelProperty("开始时间")
 	private String beginTime;
-	@ApiModelProperty("到期时间")
-	private String endTime;
+	@ApiModelProperty("VIP到期时间")
+	private Date endTime;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
+	@ApiModelProperty("剩余天数")
+	private Long dayNum;
 }