diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java index 8a42dc8..ff03497 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java @@ -38,8 +38,6 @@ public class BeanOnlineRechargeInfo { private Integer num; // 数量 @ExcelProperty("订单号") private String orderNo; // 订单号 - @ExcelProperty("备注") - private String remark; //备注 @ExcelProperty("充值平台 PC:1 手机:2") private String platform; // 充值平台 @ExcelProperty("充值时间") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java index 134ec3d..c76346d 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java @@ -38,6 +38,8 @@ public class BeanSystemRechargeInfo { private Integer permanentBean; // 永久豆 @ExcelProperty("金额") private Double money; // 金额 + @ExcelProperty("备注") + private String remark; //备注 @ExcelProperty("充值时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date rechargeTime; // 充值时间