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/course/mapper/TOperatorUserMapper.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorUserMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorUserMapper.java
index acf94b3..72b0b73 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorUserMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorUserMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.guns.modular.system.model.OperatorUser;
+import com.dsh.guns.modular.system.model.OperatorUserVO;
import com.dsh.guns.modular.system.model.TOperator;
import org.apache.ibatis.annotations.Param;
@@ -16,13 +17,13 @@
*/
public interface TOperatorUserMapper extends BaseMapper<OperatorUser> {
- List<Map<String, Object>> listAll(@Param("page")Page<Map<String, Object>> page,
- @Param("province") String province,
- @Param("city")String city,
- @Param("userName")String userName,
- @Param("phone") String phone,
- @Param("platform")Integer platform,
- @Param("type")Integer type,
- @Param("state")Integer state);
+ List<OperatorUserVO> listAll(
+ @Param("province") String province,
+ @Param("city")String city,
+ @Param("userName")String userName,
+ @Param("phone") String phone,
+ @Param("platform")Integer platform,
+ @Param("type")Integer type,
+ @Param("state")Integer state);
}
--
Gitblit v1.7.1