Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

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

@@ -1158,25 +1158,25 @@
    /**
     * 撤销走访
     *
     * @param id
     * @param idDTO
     * @return
     */
    @PostMapping("/eventvisitingtasks/cancel/{id}")
    R cancel(@PathVariable("id") Long id);
    @PostMapping("/eventvisitingtasks/cancel")
    R cancel(@RequestBody IdDTO idDTO);

    /**
     * 恢复走访
     *
     * @param id
     * @param idDTO
     * @return
     */
    @PostMapping("/eventvisitingtasks/reset/{id}")
    R reset(@PathVariable("id") Long id);
    @PostMapping("/eventvisitingtasks/reset")
    R reset(@RequestBody IdDTO idDTO);

    /**
     * 新增走访
     *
     * @param ids
     * @param idDTO
     * @param communityId
     * @param userId
     * @return