Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 d698714e61e1b322ef12d65a52089ceff8a63703

 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;
}