--no commit message

app/member/src/main/java/com/zrqx/member/bg/member/controller/MemberController.java

@@ -51,9 +51,8 @@ public class MemberController {
 	/** 用户基础信息service */
 	@Autowired
 	private MemberService service;
-	/** 用户支付记录service */
-	@Autowired
-	private PayInfoService payInfoService;
+	
+	
 	@ApiOperation(value = "查询会员账号是否存在", notes = "查询会员账号是否存在-普通用户和专家用户 共用此接口")
 	@GetMapping(value ="/isExist")
 	public CallBack<Boolean> isExistByAccount(Integer id, String account) {

app/member/src/main/java/com/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java

@@ -14,7 +14,7 @@ public interface PersonalMemberMapper extends BaseMapper<PersonalMember>{
 	
 	
 	@Select("<script>"
-			+ " select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password "
+			+ " select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password,pm.vip,pm.endTime "
 			+ " from m_Member m "
 			+ " left join m_Personal_Member pm "
 			+ " on m.id = pm.id "

app/member/src/main/java/com/zrqx/member/commons/form/bg/pmember/SaveOrUpdatePMemberForm.java

 package com.zrqx.member.commons.form.bg.pmember;
 
+import java.util.Date;
+
 import com.zrqx.member.commons.form.bg.member.SaveMemberForm;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -41,4 +43,8 @@ public class SaveOrUpdatePMemberForm extends SaveMemberForm{
 	private Integer sex;
 	@ApiModelProperty("头像地址")
 	private String img;
+	@ApiModelProperty("VIP到期时间")
+	private Date endTime;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
 }
\ No newline at end of file

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

 package com.zrqx.member.commons.vo.bg.member;
 
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,4 +40,8 @@ public class PMemberVO {
 	private String img;
 	@ApiModelProperty("密码")
 	private String password;
+	@ApiModelProperty("VIP到期时间")
+	private Date endTime;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
 }