Merge remote-tracking branch 'origin/master'

rain

2026-01-29 d0d4a8004573673e279343985bfe6497bbc9f6bd

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDevicePerShareDTO.java

File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/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;

}