From 8e4000461f3a6bbee34068b78ed60292c0ada611 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 13:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index c7a8918..1ec7411 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -57,6 +57,7 @@
param = query;
FinSysTenantUser sysInfo = this.getSysInfo();
+
return depFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
}
@@ -171,8 +172,6 @@
map.put("code", businessFormCode);
map.put("date", DateUtils.toShowDate(dealTime));
map.put("name", operatorName);
- map.put("countNum", 0);
- map.put("totalAmount", 0);
map.put("dataList", export);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
--
Gitblit v1.9.1