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 d0e1179..2903b9d 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 @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -103,10 +104,10 @@ public class CashCollection implements Serializable { private Integer cashRoleId; //角色id(0客服,1地区财务/负责人,2总部) @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime createTime; + private Date createTime; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime updateTime; + private Date updateTime; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime auditTime; @@ -114,10 +115,10 @@ public class CashCollection implements Serializable { //搜索筛条件 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private DateTime startTime; // 付款时间起 + private LocalDateTime startTime; // 付款时间起 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private DateTime endTime; // 付款时间止 + private LocalDateTime endTime; // 付款时间止 @ExcelIgnore private String sortField; //排序字段 @ExcelIgnore