From d231b4211b17951f403d17aa57b2f0d5f9e43f89 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 22 二月 2023 17:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs' into bfwcs
---
src/main/java/com/zy/asrs/controller/SteController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 4986dd8..409c972 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/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);
}
--
Gitblit v1.9.1