Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java

@@ -1,13 +1,14 @@
package com.panzhihua.common.model.vos;

import java.util.List;

import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -33,6 +34,5 @@
    private CommunityGovernanceTrendsVO communityGovernanceTrendsVO;
    @ApiModelProperty("社区活动情况")
    private List<CommunityActivitiesVO> communityActivitiesVOS;


}