代码合并

business-service/src/main/java/com/ozs/service/service/MsgAlarmCloudService.java

@@ -33,7 +33,7 @@ public interface MsgAlarmCloudService extends IService<MsgAlarmCloud> {
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
 
     /**
-     * 通过相机编码查询未解除预警信息
+     * 通过相机编码查询未处置预警信息
      *
      * @param cameraCode
      * @return

business-service/src/main/java/com/ozs/service/service/MsgAlarmService.java

@@ -35,7 +35,7 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
 
     /**
-     * 通过相机编码查询未解除预警信息
+     * 通过相机编码查询未处置预警信息
      *
      * @param cameraCode
      * @return