Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

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

@@ -65,4 +65,9 @@
     * 手动取消工作档
     */
    void cancelWrkMast(String workNo, Long userId);

    /**
     * 手动拣料入库工作档
     */
    void pickWrkMast(String workNo, Long userId);
}