From bb13f9a02e1ad58bccee312efef11399a6c1bfbe Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 14 Nov 2025 18:20:15 +0800 Subject: [PATCH] =?UTF-8?q?11-14=20=E6=94=B6=E6=AC=BE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/cash/CashCollection.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 2966402..d3169d5 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -25,7 +25,7 @@ import java.util.List; @AllArgsConstructor public class CashCollection implements Serializable { private static final long serialVersionUID = 1L; - + @ExcelProperty("序号") private Integer id; //订单信息 private Integer orderType; // 订单类型：1-收款，2-退款 @@ -37,7 +37,7 @@ public class CashCollection implements Serializable { private String market; // 所属地区 @ExcelProperty("所属地区") private String marketName; // 所属地区名称 - @ExcelProperty("活动") + @ExcelProperty("活动名称") private String activity; // 活动 @ExcelProperty("金币订单号") private String orderCode; // 金币订单号 @@ -47,6 +47,7 @@ public class CashCollection implements Serializable { private String goodsName; // 商品名称 @ExcelProperty("商品数量") private Integer goodNum; // 商品数量 + @ExcelProperty("数量单位") private String numUnit; //数量单位 个/月/年 @ExcelProperty("永久金币数量") private Integer permanentGold; // 永久金币数量 @@ -79,13 +80,13 @@ public class CashCollection implements Serializable { private Integer status; // 订单状态 @ExcelIgnore private Integer submitterId; // 提交人 id - @ExcelProperty("提交人地区") + @ExcelIgnore private String submitterMarket; //提交人地区 @ExcelProperty("提交人姓名") private String submitterName; // 提交人 姓名 @ExcelProperty("转账凭证") private String voucher; // 转账凭证 - @ExcelProperty("备注") + @ExcelIgnore private String remark; // 备注 @ExcelIgnore private String receivedRemark; //到账备注