From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java
index 20c7e2b..8013666 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java
@@ -4,6 +4,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.guns.core.dataScope.DataScope;
 import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.model.UserListVO;
+import com.dsh.guns.modular.system.model.UserQuery;
+import com.dsh.guns.modular.system.util.ResultUtil;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -59,4 +62,7 @@
                                              @Param("deptid") Integer deptid);
 
 
+    List<UserListVO> searchUsers(UserQuery userQuery);
+
+    ResultUtil getSMSCode(String phone);
 }

--
Gitblit v1.7.1