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

xyh

2021-06-17 6fb866218f53e1cf2c8c108c5aefc2a6a9e19c80

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java

@@ -298,7 +298,7 @@
     * @param commonEventDirectReportDTO
     * @return
     */
    @PostMapping("/event/reportDirect")
    @PostMapping("/reportDirect")
    R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
        return eventService.reportDirect(commonEventDirectReportDTO);
    }