From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001 From: luoxinwu <934743099@qq.com> Date: 星期二, 05 三月 2024 09:42:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java index 4b96913..1502c06 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.util.Date; +import java.util.List; @Data @ApiModel("新双争双评社区共建") @@ -37,6 +38,15 @@ @ApiModelProperty("社区id") private String communityId; + @ApiModelProperty("社区名字") + private String communityName; + + @ApiModelProperty("是否参与0 未参与 1已参与") + private String isJoin="0"; + + @ApiModelProperty("状态(1已发布 2进行中 3已完成)") + private String status; + @ApiModelProperty("预计完工时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date estimatedTime; @@ -53,4 +63,9 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + + @ApiModelProperty("项目规划内容") + private List<NewFightProjectPlanDTO> list; + + } -- Gitblit v1.7.1