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

tangxiaobao

2021-07-23 1d16cf86e7cff1f754576620aa27370b91df0004

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

@@ -19,6 +19,9 @@
    @ApiModelProperty("网格名字")
    private String gridName;

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

    @ApiModelProperty("社区下网格列表")
    private List<EventMapGridCascadeVO> childList;