From 67e03b179e1a257622cf2b5b21ec0610115c3bf9 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 28 五月 2024 17:48:40 +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/DeviceLogServiceImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index 5b1692d..b996cdd 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -176,7 +176,6 @@
     private List<DeviceLog> readData(String filepath) {
         ExcelReader reader = ExcelUtil.getReader(filepath, 0);
         reader.addHeaderAlias("璁惧鍚嶇О", "deviceName");
-        reader.addHeaderAlias("绫诲瀷", "type");
         reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
         reader.addHeaderAlias("鍑哄簱鏃堕棿", "outboundDate");
         reader.addHeaderAlias("缁忓姙浜�", "optUser");

--
Gitblit v1.9.1