From ba74a8c6b9e5bef2240dda9c8880bc851994f801 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 07 十二月 2023 13:50:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
index 007f831..30fecd7 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ProcureExcelTemplate.java
@@ -23,15 +23,16 @@
@Excel(name = "鏁伴噺")
private Integer num;
@Excel(name = "鍗曚环")
- private Integer price;
+ private Double price;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "瀛樻斁鍦扮偣")
private String warehouseName;
@Excel(name = "澶囨敞")
private String remark;
-
+ @ExcelIgnore
+ private Integer totalAmount;
@ExcelIgnore
private String businessFormCode;
@ExcelIgnore
--
Gitblit v1.9.1