czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-10-14 14:59:24 +08:00
parent 66373edde6 a315472bb1
commit 46ef03d4bc
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDiscountActivityDTO.java
View File

@@ -8,6 +8,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import java.io.Serial; import java.io.Serial;
import java.time.LocalTime;
import java.util.List; import java.util.List;
import com.czg.market.entity.MkDiscountThreshold; 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快递 * 可使用类型：dine堂食/pickup自取/deliv配送/express快递

7
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDiscountActivity.java
View File

@@ -12,6 +12,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serial; import java.io.Serial;
import java.time.LocalTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; 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快递 * 可使用类型：dine堂食/pickup自取/deliv配送/express快递