Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventVO.java

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

import java.util.List;

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

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

import java.util.List;

@Data
@ApiModel("大屏绘制多边形返回参数")
@@ -24,6 +25,5 @@

    @ApiModelProperty("事件数量统计数据")
    private EventLeftDownStatisticsVO leftDownStatisticsVO;


}