From 11f6d2627ce8eb37c6460892509460b0e19e5656 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 22 二月 2024 17:00:06 +0800 Subject: [PATCH] Merge branch '1.0-bug' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java index f2bffa4..cbfc476 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java @@ -73,12 +73,14 @@ */ @TableField("startTime") @ApiModelProperty("预约开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; /** * 预约结束 */ @TableField("endTime") @ApiModelProperty("预约结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; /** * 预约人 @@ -102,6 +104,7 @@ */ @TableField("payTime") @ApiModelProperty("支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTime; /** * 支付金额 @@ -149,6 +152,7 @@ * 取消时间 */ @TableField("cancelTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelTime; /** * 第三方取消退款流水号 -- Gitblit v1.7.1