From 239e649bfec17f28b19a2536c5bbaefae2b8d7c8 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期五, 30 九月 2022 16:22:56 +0800 Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java index 99db91c..e008b53 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.vos.sanshuo.ComEventRequestImageVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,9 +53,11 @@ private String type; /**上报提交时间*/ @ApiModelProperty(name = "submitDate", value = "上报提交时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date submitDate; /**选择预约调解时间*/ @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date appointmentTime; /**申请人选择的社区ID*/ @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID") @@ -82,6 +85,7 @@ private String specialistTel; /**专家受理时间*/ @ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date specialistAcceptTime; /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心") @@ -124,6 +128,7 @@ private String result; /**已归档处理完毕时间*/ @ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date resultDate; /**是否紧急*/ @ApiModelProperty(name = "urgent", value = "是否紧急") @@ -148,6 +153,7 @@ private Long createBy; /**创建时间*/ @ApiModelProperty(name = "createAt", value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createAt; /**修改人*/ @ApiModelProperty(name = "updateBy", value = "修改人") -- Gitblit v1.7.1