diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeMember/StoreMemberPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeMember/StoreMemberPageResDTO.java index 960946aca..692846dc2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeMember/StoreMemberPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeMember/StoreMemberPageResDTO.java @@ -27,5 +27,7 @@ public class StoreMemberPageResDTO { private Date startTime; @ApiModelProperty(value = "生效结束时间") private Date endTime; + @ApiModelProperty(value = "会员状态") + private Integer memberStatus; } diff --git a/xkt/src/main/resources/mapper/StoreMemberMapper.xml b/xkt/src/main/resources/mapper/StoreMemberMapper.xml index b820da7f1..27ce8ab77 100644 --- a/xkt/src/main/resources/mapper/StoreMemberMapper.xml +++ b/xkt/src/main/resources/mapper/StoreMemberMapper.xml @@ -12,7 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.user_name, s.contact_phone, sm.start_time, - sm.end_time + sm.end_time, + sm.member_status FROM store_member sm JOIN store s ON sm.store_id = s.id