From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 15:52:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' 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