From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 02 Feb 2026 17:21:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java index 15bc163..259fcd4 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java @@ -25,6 +25,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.List; + import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -73,6 +75,8 @@ private Long belongDept; + @ApiModelProperty(value = "部门集合",hidden = true) + private List<Long> deptList; -- Gitblit v1.9.3