Merge branch 'dyf-device'

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

@@ -21,6 +21,9 @@ import java.util.Date;
 @JsonInclude(JsonInclude.Include.ALWAYS)  // 关键注解
 public class Device extends TenantEntity {
 
+    /**
+     * id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     @Schema(name = "ID")
     private Long id;
@@ -29,6 +32,9 @@ public class Device extends TenantEntity {
     @TableField(exist = false)
     private Long assignId;
 
+    /**
+     * device_type
+     */
     @Schema(name = "设备类型")
     private Long deviceType;
 
@@ -100,8 +106,6 @@ public class Device extends TenantEntity {
     private Integer deviceStatus;
 
 
-
-
     /**
      * 绑定状态
      * 0 未绑定

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

@@ -25,6 +25,7 @@ public class DeviceAssignments extends TenantEntity {
 
     /**
      * 设备id
+     * device_id
      */
     private Long deviceId;
 

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

@@ -58,7 +58,9 @@ public class DeviceExcelImportDTO {
     private String remark;
 
     @ExcelProperty("设备类型名称")
-    @ColumnWidth(20)
     private String typeName;
 
+    @ExcelProperty("蓝牙名称")
+    private String bluetoothName;
+
 }