From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index c1d7e8e..8d421dd 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/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));
     }
-
 }

--
Gitblit v1.7.1