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/EventGridAdminVO.java

@@ -45,4 +45,6 @@
    private String lcGirdId;
    @ApiModelProperty(value = "关联市平台网格")
    private String lcGirdName;
    @ApiModelProperty(value = "网格所属社区id")
    private Long gridCommunityId;
}