From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java
index cf84991..f97f9c4 100644
--- a/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java
@@ -41,7 +41,7 @@
public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "type",required = false) String type,
@RequestParam(value = "departmentId",required = false) Integer departmentId){
- List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId);
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
return ResultData.success(list);
}
--
Gitblit v1.7.1