代码合并

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -66,6 +66,11 @@ public class MsgAlarmResp implements Serializable {
      * 报警里程位置
      */
     private String alarmMile;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMiles;
     /**
      * 通道编号
      */

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -148,7 +148,7 @@ public class WebSocketConteoller extends BaseController {
         }
         msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        msgAlarmResp.setAlarmMile(mile);
+        msgAlarmResp.setAlarmMiles(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
         msgAlarmResp.setCameraCode(cameraCode);
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(new LambdaQueryWrapper<BaseRailwayManagement>()