From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
index e9a7055..828da62 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
@@ -2,7 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.member.domain.dto.MerCashMemberPageDto;
 import com.ruoyi.member.domain.dto.MerMemberPageDto;
+import com.ruoyi.member.domain.vo.MerCashMemberPageVo;
 import com.ruoyi.member.domain.vo.MerMemberPageVo;
 import com.ruoyi.system.api.domain.poji.member.Member;
 import org.apache.ibatis.annotations.Param;
@@ -39,4 +41,12 @@
      * @return
      */
     List<MerMemberPageVo> pageMerMember(Page page,@Param("param")MerMemberPageDto merMemberPageDto);
+
+    /**
+     * 分页获取收银用户列表
+     * @param page
+     * @param merCashMemberPageDto
+     * @return
+     */
+    List<MerCashMemberPageVo> pageMerCashMember(Page page, @Param("param")MerCashMemberPageDto merCashMemberPageDto);
 }

--
Gitblit v1.7.1