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

zjj

昨天 ffbcb17a9ce705b443c3a450e3e3d56f13ee712f

 src/main/java/com/zy/core/thread/LiftThread.java

@@ -42,6 +42,8 @@

    String getCurrentLocNo();

    String getRealtimeOriginData();//获取实时原始数据

    //***************获取命令*****************

    LiftCommand getPickAndPutCommand(Integer taskNo, Integer pick, Integer put);//取放货指令