From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java
index 25a4bbf..b1835b2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java
@@ -5,6 +5,7 @@
import com.dsh.guns.core.dataScope.DataScope;
import com.dsh.guns.modular.system.model.MgtShopAuthDto;
import com.dsh.guns.modular.system.model.OperatorUser;
+import com.dsh.guns.modular.system.model.OperatorUserVO;
import com.dsh.guns.modular.system.model.User;
import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,6 @@
*/
public interface IOperatorUserService extends IService<OperatorUser> {
- List<Map<String, Object>> listAll( Page<Map<String, Object>> page,String province, String city, String userName, String phone, Integer platform, Integer type, Integer state);
/**
* @description 商户进件
@@ -26,4 +26,6 @@
* @return void
*/
void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto);
+
+ List<OperatorUserVO> listAll(String province, String city, String userName, String phone, Integer platform, Integer type, Integer state);
}
--
Gitblit v1.7.1