diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDiscountActivityDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDiscountActivityDTO.java index f670cb75..ff3e1538 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDiscountActivityDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDiscountActivityDTO.java @@ -2,6 +2,7 @@ package com.czg.market.dto; import java.io.Serializable; +import java.sql.Date; import java.sql.Time; import java.time.LocalDate; import java.time.LocalDateTime; @@ -45,14 +46,12 @@ public class MkDiscountActivityDTO implements Serializable { /** * 有效期开始时间 */ - @JSONField(format = "yyyy-MM-dd") - private LocalDate validStartTime; + private Date validStartTime; /** * 有效期结束时间 */ - @JSONField(format = "yyyy-MM-dd") - private LocalDate validEndTime; + private Date validEndTime; /** * 可用周期,如:周一,周二,周三,周四,周五,周六,周七 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDiscountActivity.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDiscountActivity.java index 99d237e3..a32c7ba0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDiscountActivity.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDiscountActivity.java @@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import java.io.Serializable; +import java.sql.Date; import java.sql.Time; import java.time.LocalDate; import java.time.LocalDateTime; @@ -48,12 +49,12 @@ public class MkDiscountActivity implements Serializable { /** * 有效期开始时间 */ - private LocalDate validStartTime; + private Date validStartTime; /** * 有效期结束时间 */ - private LocalDate validEndTime; + private Date validEndTime; /** * 可用周期,如:周一,周二,周三,周四,周五,周六,周七