From 80ec5979c3688a01359517cda32bc33b20c7f66b Mon Sep 17 00:00:00 2001 From: xiebin <vip_xiaobin810@163.com> Date: Fri, 09 Jan 2026 10:48:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java index fb80fc8..e330da9 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java @@ -61,7 +61,7 @@ /** * 告警类型：实时告警/历史告警 */ - @ApiModelProperty(value = "告警类型：实时告警/历史告警") + @ApiModelProperty(value = "告警类型：1.实时告警/2.历史告警") private String alarmType; /** * 告警时间 -- Gitblit v1.9.3