From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 87163a5..0a95aa4 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 @@ -26,6 +26,8 @@ import java.time.LocalTime; import java.util.Date; import java.io.Serializable; +import java.util.List; + import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -148,4 +150,16 @@ @ApiModelProperty(value = "当前用户id") private Long currentUserId; + + @ApiModelProperty(value = "部门集合",hidden = true) + private List<Long> deptList; + + @ApiModelProperty(value = "共享设备编号集合",hidden = true) + private List<Long> sharedDeviceIdList; + // 当前用户部门ID + @ApiModelProperty(value = "当前用户部门ID",hidden = true) + private String currentDeptId; + // regionName + @ApiModelProperty(value = "regionName",hidden = true) + private String regionName; } -- Gitblit v1.9.3