diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalExcelDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalExcelDTO.java index bba01c7..dfa2cf2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalExcelDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalExcelDTO.java @@ -14,8 +14,6 @@ public class ReturnApprovalExcelDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); this.statusStr = convertStatus(entity.getStatus()); - this.createTimeStr = entity.getCreateTime() != null ? - DateUtil.format(entity.getCreateTime(), "yyyy-MM-dd HH:mm:ss") : ""; this.approvalTimeStr = entity.getApprovalTime() != null ? DateUtil.format(entity.getApprovalTime(), "yyyy-MM-dd HH:mm:ss") : ""; } @@ -34,8 +32,8 @@ public class ReturnApprovalExcelDTO { @ExcelColumn(name = "审批编号") private Long approvalId; - @ExcelColumn(name = "归还数量") - private Integer returnQuantity; +// @ExcelColumn(name = "归还数量") +// private Integer returnQuantity; @ExcelColumn(name = "商品单价") private BigDecimal goodsPrice; @@ -46,17 +44,17 @@ public class ReturnApprovalExcelDTO { @ExcelColumn(name = "审批状态") private String statusStr; - @ExcelColumn(name = "创建时间") - private String createTimeStr; - - @ExcelColumn(name = "审批人") - private String auditName; - - @ExcelColumn(name = "商品名称") - private String goodsName; - - @ExcelColumn(name = "手机号码") - private String mobile; +// @ExcelColumn(name = "创建时间") +// private String createTimeStr; +// +// @ExcelColumn(name = "审批人") +// private String auditName; +// +// @ExcelColumn(name = "商品名称") +// private String goodsName; +// +// @ExcelColumn(name = "手机号码") +// private String mobile; @ExcelColumn(name = "审批时间") private String approvalTimeStr;