From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 11 四月 2025 20:24:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java index be537f8..571059d 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java @@ -63,7 +63,7 @@ /** * 场地责任险有效期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date insuranceEndTime; /** * 场地责任险图片 @@ -77,6 +77,7 @@ * 状态(1=正常,2=冻结,3=删除) */ private Integer state; + private Integer operatorId; /** * 添加时间 */ -- Gitblit v1.7.1