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

chen.lin

昨天 c426aa30a98ce85b494de121c92e2a7d01673930

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

@@ -14,7 +14,7 @@

    R generateFlatWarehouseTasks(WaitPakin waitPakins, String locCode, Long loginUserId);

    R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, Long loginUserId);
    R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, String targSite, Long loginUserId);

    void completeTask(List<Task> task) throws Exception;