From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 09 Feb 2026 11:00:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java | 5 ++++- 1 files changed, 4 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 0a95aa4..c352cac 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 @@ -159,7 +159,10 @@ // 当前用户部门ID @ApiModelProperty(value = "当前用户部门ID",hidden = true) private String currentDeptId; - // regionName + @ApiModelProperty(value = "regionName",hidden = true) private String regionName; + + @ApiModelProperty(value = "regionCode",hidden = true) + private String regionCode; } -- Gitblit v1.9.3