From a315472bb19ea7dd20f000796878b32078296ae6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 14 Oct 2025 14:59:08 +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=983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/market/dto/MkDiscountActivityDTO.java     | 7 +++++--
 .../java/com/czg/market/entity/MkDiscountActivity.java     | 7 +++++--
 2 files changed, 10 insertions(+), 4 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 b6f2f97a..6cd11e22 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
@@ -8,6 +8,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
+import java.time.LocalTime;
 import java.util.List;
 
 import com.czg.market.entity.MkDiscountThreshold;
@@ -68,12 +69,14 @@ public class MkDiscountActivityDTO implements Serializable {
     /**
      * 可用开始时间
      */
-    private Time useStartTime;
+    @JSONField(format = "HH:mm")
+    private LocalTime useStartTime;
 
     /**
      * 可用结束时间
      */
-    private Time useEndTime;
+    @JSONField(format = "HH:mm")
+    private LocalTime useEndTime;
 
     /**
      * 可使用类型：dine堂食/pickup自取/deliv配送/express快递
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 9aa71480..f0f147ef 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
@@ -12,6 +12,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import java.io.Serial;
+import java.time.LocalTime;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -72,12 +73,14 @@ public class MkDiscountActivity implements Serializable {
     /**
      * 可用开始时间
      */
-    private Time useStartTime;
+    @JSONField(format = "HH:mm")
+    private LocalTime useStartTime;
 
     /**
      * 可用结束时间
      */
-    private Time useEndTime;
+    @JSONField(format = "HH:mm")
+    private LocalTime useEndTime;
 
     /**
      * 可使用类型：dine堂食/pickup自取/deliv配送/express快递