From d18e70e100f5d41f05941a115180ccdc564e5e33 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 25 May 2025 21:43:27 +0800 Subject: [PATCH] basic stall --- .../com/bonus/canteen/core/basic/domain/BasicCanteen.java | 8 ++++---- .../com/bonus/canteen/core/basic/domain/BasicStall.java | 8 ++++---- .../canteen/core/basic/domain/BasicStallMealtime.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java index 971262d..91bb397 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteen.java @@ -55,14 +55,14 @@ public class BasicCanteen extends BaseEntity { /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 10, dateFormat = "HH:mm:ss") private Date bizStartTime; /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 10, dateFormat = "HH:mm:ss") private Date bizEndTime; /** 食堂图片链接 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java index ab90fb1..99d1e03 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStall.java @@ -63,14 +63,14 @@ public class BasicStall extends BaseEntity { /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 10, dateFormat = "HH:mm:ss") private Date bizStartTime; /** 营业时间 */ @ApiModelProperty(value = "营业时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "营业时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "营业时间", width = 10, dateFormat = "HH:mm:ss") private Date bizEndTime; /** 是否启用配送配置 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java index 76eb622..7001ad8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicStallMealtime.java @@ -41,14 +41,14 @@ public class BasicStallMealtime extends BaseEntity { /** 开始时间 */ @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "开始时间", width = 10, dateFormat = "HH:mm:ss") private Date bizStartTime; /** 结束时间 */ @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "结束时间", width = 10, dateFormat = "HH:mm:ss") private Date bizEndTime; /** 是否启用(1是,2否) */