From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 15:52:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
index e2352af..958b338 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
+++ b/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));
     }
 
 }

--
Gitblit v1.7.1