From 9c314ed0a45571e16b27dc8ff1a91230d77f0212 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 10 十月 2022 10:56:25 +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/community/ComActActivityVO.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java index c004eb9..95e4457 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.dtos.community.ActivityInviteDTO; +import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; @@ -329,4 +330,7 @@ @ApiModelProperty(value = "街道id", hidden = true) private Long streetId; + + @ApiModelProperty("清单信息") + private ComActNeighborCircleDetailAppVO listDetail; } -- Gitblit v1.7.1