From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java
index 3c658ae..3f42abc 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceExcel.java
+++ b/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)
--
Gitblit v1.9.3