From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 14 Jan 2026 11:27:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java index d3716a1..a2bb79a 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java @@ -58,12 +58,12 @@ /** * 无人机类型（微型机/植保机...） */ - @ApiModelProperty(value = "无人机类型（微型机/植保机...）") + @ApiModelProperty(value = "无人机类型（1.微型机/2.植保机...）") private String droneType; /** * 告警类型：实时告警/历史告警 */ - @ApiModelProperty(value = "告警类型：实时告警/历史告警") + @ApiModelProperty(value = "告警类型：1.实时告警/2.历史告警") private String alarmType; /** * 告警时间 @@ -79,7 +79,7 @@ /** * 飞行状态：侦测中/反制中 */ - @ApiModelProperty(value = "飞行状态：侦测中/反制中") + @ApiModelProperty(value = "飞行状态：1.侦测中/2.反制中") private String flightStatus; /** * 当前经度 @@ -114,7 +114,7 @@ /** * 反制方式：信号干扰/诱导驱离/无 */ - @ApiModelProperty(value = "反制方式：信号干扰/诱导驱离/无") + @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/3.无") private String counterWay; /** * 区域名称 @@ -130,7 +130,7 @@ /** * 设备类型（察打一体/便捷侦测箱/反制枪） */ - @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）") + @ApiModelProperty(value = "设备类型（1.便捷侦测箱/2.反制枪/3.察打一体）") private String deviceType; -- Gitblit v1.9.3