From c6f79f5720c5d4a700b8b759a93393559409fd1c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 20 五月 2024 15:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
index b7422a6..da794c3 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
@@ -201,11 +201,12 @@
     private List<Hole> readData(String filepath) {
         ExcelReader reader = ExcelUtil.getReader(filepath, 0);
         reader.addHeaderAlias("閽诲瓟缂栧彿", "code");
-        reader.addHeaderAlias("瀛斿彛楂樼▼", "elevation");
-        reader.addHeaderAlias("璁捐瀛旀繁", "depth");
+        reader.addHeaderAlias("瀛斿彛楂樼▼(m)", "elevation");
+        reader.addHeaderAlias("璁捐瀛旀繁(m)", "depth");
         reader.addHeaderAlias("閽诲瓟缁忓害", "longitude");
         reader.addHeaderAlias("閽诲瓟绾害", "latitude");
-        reader.addHeaderAlias("杩涘害", "pic1");
+        reader.addHeaderAlias("鎬昏繘灏�(m)", "footage");
+        reader.addHeaderAlias("宸插畬鎴愯繘灏�(m)", "footageCpl");
 
         List<Hole> list = reader.readAll(Hole.class);
         return list;

--
Gitblit v1.9.1