From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java
index 95c7964..6ef0325 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java
@@ -40,20 +40,20 @@
 	private static final long serialVersionUID = 1L;
 
 
-	@ExcelProperty("机构名称")
+	@ExcelProperty("机构名称*")
 	@ColumnWidth(20)
 	private String deptName;
 
-	@ExcelProperty(value = "所属区划编码")
+	@ExcelProperty(value = "所属区划编码*")
 	@ColumnWidth(20)
 	private String areaCode;
 
-	@ExcelProperty("机构描述")
+	@ExcelProperty("机构描述*")
 	@ColumnWidth(20)
 	private String remark;
 
 	@ColumnWidth(20)
-	@ExcelProperty(value = "机构状态", converter = ExcelDictConverter.class)
+	@ExcelProperty(value = "机构状态*", converter = ExcelDictConverter.class)
 	@ExcelDictItemLabel(type = "institutionStatus")
 	@ExcelDictItem(type = "institutionStatus")
 	private String status;

--
Gitblit v1.9.3