Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs

luxiaotao1123

2022-12-03 455e8885455fb73ad1c4755e86cab54d93223db2

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

@@ -101,6 +101,12 @@
            if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
                vo.setChargeStatus(steProtocol.getChargeStatus()==1?"✔":"×");
            }
            if (!Cools.isEmpty(steProtocol.getAlarm())) {
                vo.setAlarm1(String.valueOf(steProtocol.getAlarm()));
            }
            if (!Cools.isEmpty(steProtocol.getAlarm0())) {
                vo.setAlarm2(String.valueOf(steProtocol.getAlarm0()));
            }
        }
        return R.ok().add(list);
    }