From dd99da83d2708dc1fdb84f9fa71b5e63d5579338 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 17:37:08 +0800
Subject: [PATCH] Merge branch 'local_20221104' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
index a6eb088..26cdb62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.vos.community;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -28,6 +29,7 @@
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     /**
@@ -57,4 +59,7 @@
 
     @ApiModelProperty("分类名称")
     private String columnName;
+
+    @ApiModelProperty("propertyId")
+    private Long propertyId;
 }

--
Gitblit v1.7.1