Commit fbc33484 zshaohui

Merge remote-tracking branch 'origin/master'

2 个父辈 65571d78 d5f098fb
...@@ -243,10 +243,10 @@ public class MicronStatusController { ...@@ -243,10 +243,10 @@ public class MicronStatusController {
String[] nameList = new String[]{}; String[] nameList = new String[]{};
String robotName = "R1"; String robotName = "R1";
if (boxName.equals("MI1")) { if (boxName.equals("MI1")) {
nameList = new String[]{"M1", "M2", "M3", "M4"}; nameList = new String[]{"M3", "M4", "M7", "M8"};
robotName = "R1"; robotName = "R1";
} else if (boxName.equals("MI2")) { } else if (boxName.equals("MI2")) {
nameList = new String[]{"M5", "M6", "M7", "M8"}; nameList = new String[]{"M1", "M2", "M5", "M6"};
robotName = "R2"; robotName = "R2";
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!