Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java

@@ -17,20 +17,20 @@
package org.sxkj.fw.device.excel;


import lombok.Data;

import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;


/**
 * 设备表 Excel实体类
 *
 * @author Aix
 * @author aix
 * @since 2026-01-08
 */
@Data
@@ -84,6 +84,30 @@
   @ExcelProperty("来源")
   private String source;
   /**
    * 用途
    */
   @ColumnWidth(20)
   @ExcelProperty("用途")
   private String purpose;
   /**
    * 所属部门
    */
   @ColumnWidth(20)
   @ExcelProperty("所属部门")
   private Long belongDept;
   /**
    * 负责人
    */
   @ColumnWidth(20)
   @ExcelProperty("负责人")
   private String charger;
   /**
    * 联系电话
    */
   @ColumnWidth(20)
   @ExcelProperty("联系电话")
   private String contactPhone;
   /**
    * 备注
    */
   @ColumnWidth(20)