From d0d4a8004573673e279343985bfe6497bbc9f6bd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 14:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/dto/FwDevicePerShareDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java
similarity index 67%
rename from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/dto/FwDevicePerShareDTO.java
rename to drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java
index 95c4599..eeb93e8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/dto/FwDevicePerShareDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java
@@ -14,11 +14,10 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.sxkj.fw.fwDevicePerShare.dto;
+package org.sxkj.fw.device.dto;
-import org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
/**
* 设备权限分享表 数据传输对象实体类
@@ -27,8 +26,25 @@
* @since 2026-01-28
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDevicePerShareDTO extends FwDevicePerShareEntity {
+public class FwDevicePerShareDTO {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @ApiModelProperty(value = "设备编号")
+ private String deviceSn;
+ /**
+ * 借出方部门ID
+ */
+ @ApiModelProperty(value = "借出方部门ID")
+ private Long loanFromDeptId;
+ /**
+ * 借入方部门ID
+ */
+ @ApiModelProperty(value = "借入方部门ID")
+ private Long loanToDeptId;
+
}
--
Gitblit v1.9.3