Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 8d33e4df2aa8d5fce2ab4ebfd7309899538c2645

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

@@ -877,4 +877,12 @@
     */
    @PostMapping("/eventgridmembergpslog/add")
    R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);

    /**
     * 直接上报社区
     * @param commonEventDirectReportDTO
     * @return
     */
    @PostMapping("/event/reportDirect")
    R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
}