From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期二, 28 九月 2021 20:58:41 +0800 Subject: [PATCH] Merge branch 'test_bak' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java index 08bee7d..f2460c6 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java @@ -1,11 +1,12 @@ package com.panzhihua.common.model.vos.partybuilding; +import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -39,6 +40,7 @@ private String cover; @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("内容") @@ -67,7 +69,6 @@ @ApiModelProperty("动态内容富文本--纯文本") private String contentText; - @ApiModelProperty(value = "是否增加 1 增加 0 不增加") private Integer isAdd; -- Gitblit v1.7.1