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 5a184a8..53fc485 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 @@ -29,7 +29,7 @@ public class ConsumeUser implements Serializable { private static final long serialVersionUID = 1L; - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 @ExcelProperty("订单号") private String orderCode; // 订单号 @@ -51,7 +51,8 @@ public class ConsumeUser implements Serializable { private BigDecimal taskGold; // 任务金币 @ExcelProperty("备注") private String remark; // 备注 - @ExcelProperty("提交人ID") + @ExcelIgnore +// @ExcelProperty("提交人ID") private Integer adminId; //提交人Id @ExcelProperty("提交人姓名") private String adminName; //提交人姓名 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 ceff93e..b7e9bfe 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 @@ -26,7 +26,7 @@ public class RechargeUser { private static final long serialVersionUID = 1L; - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 @ExcelProperty("订单号") private String orderCode; // 订单号 @@ -65,11 +65,10 @@ public class RechargeUser { @ExcelProperty("备注") private String remark; // 备注 - - @ExcelProperty("提交人Id") + @ExcelIgnore private Integer adminId; // 提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; // 提交人姓名 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") 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 d7e51c1..7dbffe8 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 @@ -29,7 +29,7 @@ public class RefundUser { @ExcelProperty("订单号") private String orderCode; // 订单号 - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 @ExcelProperty("精网号") private Integer jwcode; // 精网号 @@ -51,7 +51,8 @@ public class RefundUser { private BigDecimal taskGold; // 任务金币 @ExcelProperty("退款原因") private String remark; // 退款原因 - @ExcelProperty("提交人ID") +// @ExcelProperty("提交人ID") + @ExcelIgnore private Integer adminId; //提交人Id @ExcelProperty("提交人姓名") private String adminName; //提交人姓名