From 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 七月 2025 21:11:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java index 7c7fe66..67423d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java @@ -14,6 +14,10 @@ private String deptCode; @Excel(name = "项目部名称") private String deptName; + @Excel(name = "基层管理员部门编号") + private String deptNumber; + @Excel(name = "基层管理员项目部编号") + private String projectDeptNumber; @Excel(name = "基层管理员姓名 巡检员") private String nickName; @Excel(name = "保洁员部门编号") @@ -22,8 +26,12 @@ private String deptCodeClear; @Excel(name = "保洁员片区编号") private String cleanerCodeClear; + @Excel(name = "保洁员(驾驶员)") + private String cleanerName; @Excel(name = "路段总号") private String locationCode; + @Excel(name = "个人编号") + private String cleanerCode; @Excel(name = "点位类型") private String locationType; @Excel(name = "路段名(村名)") -- Gitblit v1.7.1