diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java index aa31f14..5dbfe61 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java @@ -75,8 +75,8 @@ public class KitchenSampleDishesRecord extends BaseEntity { /** 留样时间 */ @ApiModelProperty(value = "留样时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "留样时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "留样时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date sampleSaveTime; /** 厨师id */ @@ -96,26 +96,26 @@ public class KitchenSampleDishesRecord extends BaseEntity { /** 打印时间 */ @ApiModelProperty(value = "打印时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "打印时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date printRecordTime; /** 进入留样柜时间 */ @ApiModelProperty(value = "进入留样柜时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "进入留样柜时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "进入留样柜时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date enterCabinetTime; /** 离开留样柜时间 */ @ApiModelProperty(value = "离开留样柜时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "离开留样柜时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "离开留样柜时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date leaveCabinetTime; /** 过期时间 */ @ApiModelProperty(value = "过期时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date expirationTime; /** 重量是否达到标准 1是2否 */