From 9d424108c500e585f91c3e7fe7b3ec53c703b0c3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 14 Oct 2025 14:53:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=20=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/market/dto/MkDiscountActivityDTO.java    | 8 ++++----
 .../java/com/czg/market/entity/MkDiscountActivity.java    | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

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 8e192ebc..b6f2f97a 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
@@ -45,15 +45,15 @@ public class MkDiscountActivityDTO implements Serializable {
 
     /**
      * 有效期开始时间
+     * yyyy-MM-dd
      */
-    @JSONField(format = "yyyy-MM-dd")
-    private LocalDate validStartTime;
+    private String validStartTime;
 
     /**
      * 有效期结束时间
+     * yyyy-MM-dd
      */
-    @JSONField(format = "yyyy-MM-dd")
-    private LocalDate validEndTime;
+    private String 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 a32c7ba0..9aa71480 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
@@ -1,5 +1,6 @@
 package com.czg.market.entity;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -49,12 +50,14 @@ public class MkDiscountActivity implements Serializable {
     /**
      * 有效期开始时间
      */
-    private Date validStartTime;
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate validStartTime;
 
     /**
      * 有效期结束时间
      */
-    private Date validEndTime;
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate validEndTime;
 
     /**
      * 可用周期，如：周一,周二,周三,周四,周五,周六,周七