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; //到账备注