Merge remote-tracking branch 'remotes/origin/develop'

cuijian

2023-08-19 bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22

 lxzn-module-system/lxzn-system-api/lxzn-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -194,7 +194,7 @@
     * @return
     */
    @GetMapping("/sys/api/queryAllUser")
    public JSONObject queryAllUser(@RequestParam(name="userIds",required=false)String userIds, @RequestParam(name="pageNo",required=false) Integer pageNo,@RequestParam(name="pageSize",required=false) int pageSize);
    public JSONObject queryAllUser(@RequestParam(name="userIds",required=false)String userIds, @RequestParam(name="pageNo",required=false) Integer pageNo,@RequestParam(name="pageSize",required=false) Integer pageSize);


    /**
@@ -439,9 +439,9 @@
     * @param ids
     * @return
     */
    @GetMapping("/sys/api/queryDepartsByOrgIds")
    List<JSONObject> queryDepartsByOrgIds(@RequestParam("ids") String ids);
    
//    @GetMapping("/sys/api/queryDepartsByOrgIds")
//    List<JSONObject> queryDepartsByOrgIds(@RequestParam("ids") String ids);
//
    /**
     * 40发送邮件消息
     * @param email