From 51a3e7178451c27da9ae534e059020274c9d81a9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 十月 2025 17:10:44 +0800
Subject: [PATCH] Merge branch 'master' into ywx
---
pom.xml | 6 ------
src/main/java/com/chinaztt/mes/docx/util/TakeWords.java | 1 +
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index b427f73..b39de63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,12 +35,6 @@
<artifactId>tess4j</artifactId>
<version>5.12.0</version>
</dependency>
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv-platform</artifactId>
- <!-- 鎸囧畾鍏蜂綋鐗堟湰鍙� -->
- <version>1.5.10</version>
- </dependency>
<!-- 澶勭悊 .xls (OLE2) 鏍煎紡 -->
<dependency>
<groupId>org.apache.poi</groupId>
diff --git a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
index 70f5c15..d648dc7 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -2,6 +2,7 @@
import cn.hutool.core.io.FileUtil;
import com.chinaztt.mes.docx.dto.GetFileDto;
+import com.chinaztt.mes.docx.dto.ThicknessData;
import com.opencsv.CSVReader;
import com.opencsv.CSVReaderBuilder;
import com.opencsv.exceptions.CsvValidationException;
--
Gitblit v1.9.3