From 7941db00ace2a95cf5d65b51d7ad600c225b2eda Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java | 4 +---
1 files changed, 1 insertions(+), 3 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 2d6d641..95c7964 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
@@ -44,10 +44,8 @@
@ColumnWidth(20)
private String deptName;
- @ExcelProperty(value = "所属区划", converter = ExcelDictConverter.class)
+ @ExcelProperty(value = "所属区划编码")
@ColumnWidth(20)
- @ExcelDictItemLabel(type = "regionName")
- @ExcelDictItem(type = "regionName")
private String areaCode;
@ExcelProperty("机构描述")
--
Gitblit v1.9.3