Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1217,4 +1217,11 @@
     */
    @PostMapping("/eventgridmemberrelation/cascade/list")
    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/eventgriddata/lc/list")
    R getLcGridLists();
}