From e00e10418b01eb0ee442b2dc4029925fba7ae33b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 20 十一月 2025 09:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
index 771aa09..ac31cfe 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
@@ -30,5 +30,14 @@
     @Select("select * from li_member ${ew.customSqlSegment}")
     IPage<MemberVO> pageByMemberVO(IPage<MemberVO> page, @Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);
 
+    @Select("select m.*,s.store_name as bindStoreName " +
+            "from li_member m " +
+            "LEFT JOIN li_store s on m.share_store_id = s.id " +
+            " ${ew.customSqlSegment}")
+    IPage<MemberVO> pageByMemberVOAndBindStore(IPage<MemberVO> page, @Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);
+
+    @Select("select * from li_member ${ew.customSqlSegment}")
+    List<MemberVO> exportMember(@Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);
+
     MemberVO getVoById(@Param("id") String id);
 }
\ No newline at end of file

--
Gitblit v1.8.0