合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java

@@ -87,6 +87,7 @@
                try{
                    agvWrkMastHandler.completedCarryWrk(agvWrkMast);
                } catch (Exception e){
                    //e.printStackTrace();
                    log.error("工作号"+agvWrkMast.getWrkNo()+"定时处理AGV工作档中工作状态为206,处理失败：===》异常原因："+e.getMessage());
                }
            });