--no commit message

app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java

@@ -34,7 +34,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ "]]>"
 			+ "</if>";
 	
-	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,(case when pm.vip = 1 then 1 when pm.orderType = 3 then 3 when  pm.vip = 0 then 0  end ) vip,pm.endTime "
+	String DEFAULT_SQL = " select m.id,m.account,m.status,m.phone,m.level,m.createTime,(case when pm.vip = 1 then 1 when pm.orderType = 1 then 3 when  pm.vip = 0 then 0  end ) vip,pm.endTime "
 			+ " from m_member m left join m_personal_member pm on m.id = pm.id "
 			+ " where status != 2 and level = 0 ";
 

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

@@ -9,7 +9,7 @@ public class QueryMemberForm {
 	private String account;
 	@ApiModelProperty(value = "手机号")
 	private String phone;
-	@ApiModelProperty("用户类别：0 普通用户，1vip用户")
+	@ApiModelProperty("用户类别：0 普通用户，1vip用户  3机构用户")
 	private Integer vip;
 	@ApiModelProperty(value = "用户状态 0 禁用 1启用")
 	private Integer status;