Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-05-17 97e045fb1271016af2777580b980f974977909f3

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

@@ -56,6 +56,6 @@
    /**
     * 手动取消工作档
     */
    void cancelWrkMast(String workNo, Long userId);
    void cancelWrkMast(String workNo, Long userId, Integer type);

}