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

Junjie

2023-03-27 22d9b27f913cc47d54b361870f62aa81b4c8fd85

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -114,7 +114,7 @@
                }
            }
            vo.setSpeed(shuttleProtocol.getCurrentMoveServoSpeed());  // 速度
            vo.setPakMk(shuttleProtocol.getPakMk().toString());    // 作业标记
            vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N");    // 作业标记
        }
        return R.ok().add(list);
    }