From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
index f2ef174..960e30d 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
@@ -26,7 +26,7 @@
@Excel(name = "鏁伴噺")
private Integer num;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "鎶ュ簾鍘熷洜")
private String deception;
@@ -34,6 +34,8 @@
private String remark;
@ExcelIgnore
+ private Integer totalAmount;
+ @ExcelIgnore
private String businessFormCode;
@ExcelIgnore
private Long dealTime;
--
Gitblit v1.9.1