Merge branch 'huacheng' into huacheng_test

101captain

2022-06-30 cc595b0aa24773735417accd0158da6ac98a6db0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java

@@ -1,4 +1,15 @@
package com.panzhihua.common.model.vos.neighbor;

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

import java.util.List;

@Data
public class ActivityAnalysisVO {
    @ApiModelProperty("机关单位总数")
    private Integer unitCount;

    @ApiModelProperty("统计数据")
    private List<ComActNeighborCircleAnalysisVO> dataList;
}