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/device/vo/FwDeviceVO.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java index 4960103..18e0b59 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java @@ -196,4 +196,17 @@ */ @ApiModelProperty(value = "更新时间") private Date updateTime; + + @ApiModelProperty(value = "出库去向") + private String outTarget; + + @ApiModelProperty(value = "是否被共享给当前机构") + private Boolean isShared; + + @ApiModelProperty(value = "共享记录ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long shareId; + + @ApiModelProperty(value = "最终出库区域") + private String finalOutboundArea; } -- Gitblit v1.9.3