From 695ff7ec8bd12b6cf32b77902bd5cfb44419b835 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 09:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
index b24aa9e..0808124 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
@@ -49,11 +49,6 @@
@Autowired
private WeChatUtil weChatUtil;
-
- @Override
- public List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) {
- return this.baseMapper.listAll(page,province,city,userName,phone,platform,type,state);
- }
@Override
public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
@@ -79,4 +74,9 @@
shopAuthentication.setOrderNo(applymentsResult.getApplymentId());
operatorAuthService.saveOrUpdate(shopAuthentication);
}
+
+ @Override
+ public List<OperatorUserVO> listAll(String province, String city, String userName, String phone, Integer platform, Integer type, Integer state) {
+ return this.baseMapper.listAll(province,city,userName,phone,platform,type,state);
+ }
}
--
Gitblit v1.7.1