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

whycq

2024-05-27 3fa0f0b6707a0f6f696659c6e0797f8377c5e6dc

 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);

}