From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 12 七月 2025 14:42:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 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 67423d5..cb9bff8 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 @@ -10,39 +10,39 @@ @ApiModel(value = "点位导入excel") public class TLocationImportExcel implements Serializable { - @Excel(name = "项目部编号") + @Excel(name = "项目部编号",width = 20) private String deptCode; - @Excel(name = "项目部名称") + @Excel(name = "项目部名称",width = 20) private String deptName; - @Excel(name = "基层管理员部门编号") + @Excel(name = "基层管理员部门编号",width = 20) private String deptNumber; - @Excel(name = "基层管理员项目部编号") + @Excel(name = "基层管理员项目部编号",width = 20) private String projectDeptNumber; - @Excel(name = "基层管理员姓名 巡检员") + @Excel(name = "基层管理员姓名 巡检员",width = 20) private String nickName; - @Excel(name = "保洁员部门编号") - private String projectCodeClear; - @Excel(name = "保洁员项目部编号") + @Excel(name = "保洁员部门编号",width = 20) private String deptCodeClear; - @Excel(name = "保洁员片区编号") + @Excel(name = "保洁员项目部编号",width = 20) + private String projectCodeClear; + @Excel(name = "保洁员片区编号",width = 20) private String cleanerCodeClear; - @Excel(name = "保洁员(驾驶员)") + @Excel(name = "保洁员(驾驶员)",width = 20) private String cleanerName; - @Excel(name = "路段总号") + @Excel(name = "路段总号",width = 20) private String locationCode; - @Excel(name = "个人编号") + @Excel(name = "个人编号",width = 20) private String cleanerCode; - @Excel(name = "点位类型") + @Excel(name = "点位类型",width = 20) private String locationType; - @Excel(name = "路段名(村名)") + @Excel(name = "路段名(村名)",width = 20) private String locationName; - @Excel(name = "起点") + @Excel(name = "起点",width = 20) private String locationAddress; - @Excel(name = "终点") + @Excel(name = "终点",width = 20) private String locationAddressEnd; - @Excel(name = "起点(经纬度)") + @Excel(name = "起点(经纬度)",width = 20) private String locationAddressLonLat; - @Excel(name = "终点(经纬度)") + @Excel(name = "终点(经纬度)",width = 20) private String locationAddressEndLonLat; } -- Gitblit v1.7.1