Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -219,8 +219,7 @@
    @ApiOperation(" 查询导办用户列表（不分页）")
    @GetMapping("/queryList")
    @Authorization
    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));
    }

}