Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -4,6 +4,8 @@
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 org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -59,4 +61,5 @@
                                             @Param("deptid") Integer deptid);


    List<UserListVO> searchUsers(UserQuery userQuery);
}