From 59baf35167dbea5d56610932df3088c510a8146d Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Tue, 18 Nov 2025 14:53:38 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9EmemberStatus;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/xkt/dto/storeMember/StoreMemberPageResDTO.java   | 2 ++
 xkt/src/main/resources/mapper/StoreMemberMapper.xml            | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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