From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 19 八月 2023 10:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop'

---
 lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java b/lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
index dfa9a71..a803843 100644
--- a/lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
+++ b/lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
@@ -121,10 +121,20 @@
         return null;
     }
 
+    /**
+     * 19鍒嗛〉鏌ヨ鐢ㄦ埛 杩斿洖JSONObject
+     *
+     * @param userIds  澶氫釜鐢ㄦ埛id
+     * @param pageNo   褰撳墠椤垫暟
+     * @param pageSize 姣忛〉鏉℃暟
+     * @return
+     */
     @Override
-    public JSONObject queryAllUser(String userIds, Integer pageNo, int pageSize) {
+    public JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize) {
         return null;
     }
+
+
 
     @Override
     public List<ComboModel> queryAllRole(String[] roleIds) {
@@ -303,7 +313,7 @@
         return null;
     }
 
-    @Override
+//    @Override
     public List<JSONObject> queryDepartsByOrgIds(String ids) {
         return null;
     }

--
Gitblit v1.9.3