From 41dc0ffbb2b66fd6da78603adfadd5b574d0aab6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 14:20:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
index 8a02a50..6fff2df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.sanshuo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -76,6 +77,7 @@
private String specialistTel;
/**专家受理时间*/
@ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间")
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
private Date specialistAcceptTime;
/**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
@ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
@@ -114,13 +116,18 @@
@ApiModelProperty(name = "result", value = "归档结案报告")
private String result;
/**已归档处理完毕时间*/
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
@ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间")
private Date resultDate;
/**创建时间*/
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
@ApiModelProperty(name = "createAt", value = "创建时间")
private Date createAt;
/**调解上传图片地址列表，逗号进行分割*/
@ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
private List<ComEventRequestImageVO> images;
+
+ @ApiModelProperty("时间类型名称")
+ private String categoryName;
}
--
Gitblit v1.7.1