From b2da163832b4e665645d39a5ec3ece7209d75143 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 26 八月 2026 10:13:20 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_克拉玛依市新聚工贸_pro
---
src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
index f871b91..c3cf7ea 100644
--- a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
@@ -70,9 +70,9 @@
*/
int deleteCustomerByIds(Long[] ids);
- IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+ IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId, @Param("isAdmin") Boolean isAdmin);
- List<CustomerVo> list(@Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+ List<CustomerVo> list(@Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId, @Param("isAdmin") Boolean isAdmin);
IPage<CustomerTransactionsVo> customewTransactions(Page page, @Param("customerName") String customerName);
--
Gitblit v1.9.3