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

lty

17 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/asrs/service/WorkService.java

@@ -1,5 +1,6 @@
package com.zy.asrs.service;

import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
@@ -97,7 +98,7 @@
     * @param workNo
     * @param userId
     */
    void backLocOperation(String workNo, Long userId);
    R backLocOperation(String workNo, Long userId);

    /**
     * 通知档手动生成任务