From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
index bd6aca7..7a6cb83 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -27,7 +27,7 @@
* 瑙勫垯鍚嶇О
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "瑙勫垯鍚嶇О"})
- @ColumnWidth(40)
+ @ColumnWidth(130)
private String ruleName;
/**
@@ -37,27 +37,15 @@
private Integer num;
/**
- * 閲戦
- */
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
- private BigDecimal money;
-
- /**
* 鍒嗘暟
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
private Integer score;
/**
- * 鍓╀綑鍒嗘暟
+ * 閲戦
*/
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍓╀綑鍒嗘暟"})
- private Integer surplusScore;
-
- /**
- * 鍚堣
- */
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍚堣"})
- private BigDecimal total;
+ @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
+ private BigDecimal money;
}
--
Gitblit v1.8.0