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

huanghongfa

2022-04-14 cb2b53c615599ae0ca50fbdaa2de83be047c94fe

 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;

}