Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-30 b200b681bc401bb11c133a79273ba78cb6ebedf8

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java

@@ -136,18 +136,18 @@
    /**
     * 撤销
     *
     * @param id
     * @param idDTO
     * @return
     */
    R cancel(Long id);
    R cancel(IdDTO idDTO);

    /**
     * 恢复
     *
     * @param id
     * @param idDTO
     * @return
     */
    R reset(Long id);
    R reset(IdDTO idDTO);

    /**
     * 开始