Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 8d33e4df2aa8d5fce2ab4ebfd7309899538c2645

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -2014,7 +2014,7 @@
                }
                addTransferRecord(eventDO.getId(), commonEventDirectReportDTO.getToId(), comActVO.getName(), 2, commonEventDirectReportDTO.getProcessResult(),
                        commonEventDirectReportDTO.getUserId(), commonEventDirectReportDTO.getUserName(), 2);
                return R.ok();
                return R.ok(eventDO.getId());
            }
        }