APP/小程序用户设备绑定

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -1,7 +1,5 @@
 package com.fuyuanshen.equipment.domain;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -55,6 +53,11 @@ public class Device extends TenantEntity {
     @Schema(name = "原始所有者（创建者）")
     private Long originalOwnerId;
 
+    /**
+     * 原始设备
+     */
+    @Schema(name = "原始设备")
+    private Long originalDeviceId;
 
     /*@Schema( name = "设备编号")
     private String deviceNo;*/
@@ -99,7 +102,6 @@ public class Device extends TenantEntity {
     @Schema(name = "绑定状态")
     private Integer bindingStatus;
 
-
     /**
      * 创建人名称
      */

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java

@@ -34,6 +34,11 @@ public class DeviceType extends TenantEntity {
     @Schema(name = "原始所有者（创建者）")
     private Long originalOwnerId;
 
+    /**
+     * 原始设备
+     */
+    @Schema(name = "原始设备类型")
+    private Long originalDeviceId;
 
     @NotBlank(message = "设备类型名称不能为空")
     @Schema(name = "类型名称", required = true)

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelImportDTO.java

@@ -26,7 +26,6 @@ public class DeviceExcelImportDTO {
     @ColumnWidth(20)
     private String deviceName;
 
-
     @ExcelProperty(value = "设备图片", converter = ByteArrayImageConverter.class)
     @ColumnWidth(15)
     private byte[] devicePic;