From e76d382202ed5c8286b09593e05b2c36acde1c0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 15:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
index 36e0d66..1920baf 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -15,8 +15,9 @@
{
@Override
- public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name) {
- return baseMapper.selectConfigList(page,state,Name);
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
+ Integer state,String Name,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,Name,ids);
}
@Override
@@ -40,7 +41,7 @@
}
@Override
- public int countNum(String Name) {
- return baseMapper.countNum(Name);
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
}
}
--
Gitblit v1.7.1