From 5a8ae920dace571fbf0858f48354d3bc697e6340 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 09 十一月 2022 18:02:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
index 4af3fe7..89c75fd 100644
--- a/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
@@ -50,7 +50,7 @@
{
return getDataTable("您没有权限查看该数据");
}
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1