From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期四, 19 八月 2021 17:53:40 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java index 5aad827..db9e733 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java @@ -48,8 +48,7 @@ * 值班时间 */ @ApiModelProperty("值班时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date rotaDate; + private String rotaDate; /** * 值班领导,多个以逗号隔开 -- Gitblit v1.7.1