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

tangxiaobao

2021-07-14 15149032252ac30c5a7df721259fae5538e467af

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

@@ -17,4 +17,7 @@
    @ApiModelProperty("网格名字")
    private String gridName;

    @ApiModelProperty("网格社区id")
    private Long gridCommunityId;

}