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

tangxiaobao

2021-07-16 503135f1f8a7cfed29cac1786a6a7c8758eed8d3

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java

@@ -70,7 +70,7 @@
    }

    @ApiOperation(value = "查询网格员关联网格列表级联2-lyq",response = EventMapGridCascadeVO.class)
    @PostMapping("getGridLists")
    @PostMapping("getGridsLists")
    public R getGridsLists(){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null || userInfoVO.getUserId() == null){