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/OutputExcelTemplate.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
index 8ba8109..400d674 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java
@@ -22,14 +22,13 @@
private String baseModelName;
@Excel(name = "鏁伴噺")
private Integer num;
- @Excel(name = "鍗曚环")
- private Integer price;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "澶囨敞")
private String remark;
-
+ @ExcelIgnore
+ private Integer totalAmount;
@ExcelIgnore
private String businessFormCode;
@ExcelIgnore
--
Gitblit v1.9.1