From 7700c65ad8a29430790ee2966ff4e18cd23b7ecb Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 09:54:38 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 35912db..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
@@ -50,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