Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java

@@ -195,6 +195,11 @@
   @ApiModelProperty(value = "事件处理数据")
    private List<EventTransferRecordVO> trans;

   @ApiModelProperty(value = "特殊人群列表")
   private List<EventSpecialPopulationDetailsVO> populationList;

   @ApiModelProperty(value = "网格绑定社区id")
   private Long communityId;


}