From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
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