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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

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

@@ -505,11 +505,11 @@

    /**
     * 网格数据待处理统计信息
     * @param pageEventGridDataDTO
     * @param eventGridStatisticsDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridData")
    R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
    R getGridData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);

    /**
     * 查询用户网格
@@ -659,4 +659,12 @@
     */
    @GetMapping("/eventapplicationapprelease/edition")
    R editionUpdate();

    /**
     * 首页待处理
     * @param eventGridTodoDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridTodoData")
    R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
}