From bd927f5c9f26d5ae89a272e56a4b3bd655bd148f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
index 5559527..c480df8 100644
--- a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -36,7 +36,6 @@
      */
     @ApiOperation("查询导办事务详情")
     @GetMapping("/getData")
-    @Authorization
     public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
     {
         Assert.notNull(Id, "Id 不能为空");
@@ -51,9 +50,9 @@
      */
     @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
     @GetMapping("/selectList")
-    public TableDataInfo selectList()
+    public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
     {
-        return getDataTable(iTransactionEventService.selectList());
+        return getDataTable(iTransactionEventService.selectList(keyWord));
     }
 
 

--
Gitblit v1.7.1