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

TQS

2023-02-15 0d4b96fa26e8523e7153b7f022649ed3fc1c0a35

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

@@ -111,6 +111,7 @@
                BasSteErr steErr = basSteErrMapper.selectById(steProtocol.getAlarm());
                vo.setAlarm1(steErr==null?"未知异常":steErr.getErrName());
            }
            vo.setAlarm2(steProtocol.getAlarm0().toString());
        }
        return R.ok().add(list);
    }