Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-07 94eff0af33206a9dded2e5632add4befb809c89e

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

@@ -837,4 +837,12 @@
     */
    @PostMapping("/statistics/event/getGridEventStatistics")
    R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO);

    /**
     * 网格员上报地理位置
     * @param memberPositionDTO 请求参数
     * @return  上报结果
     */
    @PostMapping("/eventgridmembergpslog/add")
    R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);
}