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/screen/ComActPopulationScreenVO.java

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

import java.io.Serializable;
import java.util.List;

import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;

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

import java.io.Serializable;
import java.util.List;

/**
 * @author xyh
@@ -16,7 +17,6 @@
@Data
@ApiModel("大屏-人口")
public class ComActPopulationScreenVO implements Serializable {


    @ApiModelProperty(value = "总人口数")
    private Long totalNum;
@@ -54,6 +54,5 @@

    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;


}