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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java

@@ -70,7 +70,7 @@
    * @param tenantId
    * @return
    */
   IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
   IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, String deptIds, String tenantId);

   List<UserVO> getAllUser(UserVO user, Long deptId, String tenantId);