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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 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;