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

Junjie

2023-10-13 7bd6e380475d1f4ec7a030dffcf0c217b879b0a5

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

@@ -36,6 +36,9 @@
            ReturnT<String> returnT = workMastHandler.start(wrkMast);
            if (!returnT.isSuccess()) {
                wrkMast.setUpdMk("X");
                if (returnT.getMsg().length() > 255) {
                    returnT.setMsg(returnT.getMsg().substring(0, 150));
                }
                wrkMast.setErrorMemo(returnT.getMsg());
                wrkMast.setErrorTime(new Date());
                if (!wrkMastService.updateById(wrkMast)) {