From 27704b0f33dfa3b22f11d36124a8d08b720461f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 19 十月 2022 13:27:20 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index 03927e8..7b4a4c5 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -65,13 +65,13 @@
@Override
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- String matterAndUser, String classifyGrade,List<String> ids) {
- return baseMapper.selectConfigList(page, state, matterAndUser, classifyGrade,ids);
+ String keyword, String classifyGrade,List<String> ids) {
+ return baseMapper.selectConfigList(page, state, keyword, classifyGrade,ids);
}
@Override
- public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
- return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
+ public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade, List<String> ids) {
+ return baseMapper.selectConfigList(keyword,classifyGrade,ids);
}
@Override
--
Gitblit v1.7.1