From ec96abc7c3d9ef48b00c321eed85f9d934c699a5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 10:43:42 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 b7a568e..3fe4e19 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
@@ -26,8 +26,8 @@
 
     @Override
     public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
-                                                      Integer state,String Name,List<String> ids) {
-        return baseMapper.selectConfigList(page,state,Name,ids);
+                                                      Integer state,String Name,List<String> ids,String userId) {
+        return baseMapper.selectConfigList(page,state,Name,ids,userId);
     }
 
     @Override

--
Gitblit v1.7.1