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

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

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

@@ -72,6 +72,9 @@
    */
   IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);

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


   /**
    * 自定义分页
    *
@@ -225,4 +228,5 @@
   List<User> userInfoByPhoneOrAccount(String tenantId, String key);

    List<User> getUserByPhoneIds(String phoneIds);

}