Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserService.java

@@ -6,6 +6,7 @@
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;
@@ -62,4 +63,6 @@


    List<UserListVO> searchUsers(UserQuery userQuery);

    ResultUtil getSMSCode(String phone);
}