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

zjj

2 天以前 bed735aae42b6e0c75bf3fd63d9cd0996fba9355

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java

@@ -17,6 +17,9 @@
    R generateAGVTasks(WaitPakin waitPakins,String locCode,String orgSta, Long loginUserId);

//    R completeTask(String id);
     void completeTask(List<Task> task) throws Exception;

    void completeTask(List<Task> task) throws Exception;
    R removeTask(Long[] ids);

    R pickTask(Long id);
}