Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java

@@ -49,8 +49,8 @@
     */
    @ApiOperation(value = " 查询导办用户列表（不分页）",response = SysUser.class)
    @GetMapping("/queryList")
    public  ResultData  queryList(){
        return  ResultData.success(IUserService.queryList(2));
    public  ResultData  queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
        return  ResultData.success(IUserService.queryList(2,keyWord));
    }

}