diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index ccefd04..fa6616e 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -39,9 +39,9 @@ public class ConsumeUser implements Serializable { private String market; // 所属地区 @ExcelProperty("商品名称") private String goodsName; // 商品名称 - @ExcelProperty("充值方式") + @ExcelProperty("消耗平台") private String payPlatform; // 消费平台 - @ExcelProperty("金币总数") + @ExcelProperty("消耗金币总数") private BigDecimal sumGold; // 金币总数 @ExcelProperty("永久金币") private BigDecimal permanentGold; // 永久金币 @@ -54,7 +54,7 @@ public class ConsumeUser implements Serializable { @ExcelIgnore // @ExcelProperty("提交人ID") private Integer adminId; //提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; //提交人姓名 @ExcelProperty("是否退款") private Integer isRefund; //是否退款 diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java index 1513dfb..9bb01fc 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java @@ -57,7 +57,7 @@ public class RechargeUser { @ExcelProperty("支付方式") private String payModel; // 支付方式 - @ExcelProperty("充值方式") + @ExcelProperty("充值平台") private String payPlatform; // 充值方式 @ExcelProperty("支付凭证") @@ -72,10 +72,10 @@ public class RechargeUser { private String adminName; // 提交人姓名 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - @ExcelProperty("充值时间") + @ExcelProperty("付款时间") private Date payTime; // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - @ExcelProperty("审核时间") + @ExcelProperty("充值时间") private Date auditTime; // 审核时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @ExcelIgnore diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java index fa4b2e6..606d990 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java @@ -41,7 +41,7 @@ public class RefundUser { private String refundType; // 退款类型 @ExcelProperty("退款方式") private Byte refundModel; // 退款方式(0全部/1部分退款) - @ExcelProperty("金币总数") + @ExcelProperty("退款金币总数") private BigDecimal sumGold; // 金币总数 @ExcelProperty("永久金币") private BigDecimal permanentGold; // 永久金币 @@ -54,13 +54,13 @@ public class RefundUser { // @ExcelProperty("提交人ID") @ExcelIgnore private Integer adminId; //提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; //提交人姓名 @ExcelProperty("提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 - @ExcelProperty("审核时间") + @ExcelProperty("退款时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date auditTime; // 审核时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")