From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/biz/datamerge/GridMerge.kt | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/datamerge/GridMerge.kt b/src/main/kotlin/com/flightfeather/uav/biz/datamerge/GridMerge.kt
index 35420e1..4c3ea43 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/datamerge/GridMerge.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/datamerge/GridMerge.kt
@@ -3,7 +3,7 @@
import com.flightfeather.uav.lightshare.bean.DataVo
/**
- *
+ * 缃戞牸铻嶅悎妯″紡锛氭牴鎹蛋鑸寖鍥达紝鍒掑垎鐭╁舰缃戞牸锛屽皢鎵�鏈夌洃娴嬫暟鎹牴鎹粡绾害鍒掑垎鑷冲搴旂綉鏍硷紝璁＄畻鑾峰彇缃戞牸鐩戞祴鏁版嵁鍧囧�硷紱
* @date 2024/6/26
* @author feiyu02
*/
@@ -11,8 +11,9 @@
fun merge(data:List<DataVo>) {
//1. 纭畾鏁版嵁鑼冨洿锛岀敤鐭╁舰妗嗗嚭鎵�鏈夌洃娴嬫暟鎹�
-
+ val lt = foo1(data)
//2. 鏍规嵁姝ｆ柟褰㈢綉鏍肩殑杈归暱锛岃绠楀緱鍑烘墍鏈夋鏂瑰舰缃戞牸
+
//3. 鍖归厤鐩戞祴鏁版嵁鍜屽搴旂綉鏍硷紝璁＄畻缃戞牸鍧囧��
}
--
Gitblit v1.9.3