From 3793ba4a9b6be8faa6df0d4a76c06763ac03f873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:06:04 +0800
Subject: [PATCH] 外购成品报检相关问题调整
---
pom.xml | 88 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2bd747c..73d75f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,10 +24,11 @@
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
- <fastjson.version>2.0.53</fastjson.version>
+ <fastjson2.version>2.0.53</fastjson2.version>
+ <fastjson.version>2.0.23</fastjson.version>
<oshi.version>6.6.5</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.2.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<!-- override dependency version -->
@@ -44,6 +45,7 @@
<okhttp.version>4.9.0</okhttp.version>
<hutool.version>5.8.18</hutool.version>
<easyexcel.version>3.3.2</easyexcel.version>
+ <poi.tl.version>1.12.2</poi.tl.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -182,7 +184,7 @@
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
- <version>${fastjson.version}</version>
+ <version>${fastjson2.version}</version>
</dependency>
<!-- Token鐢熸垚涓庤В鏋�-->
@@ -199,17 +201,10 @@
<version>${kaptcha.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+ <!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
+ <artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -227,13 +222,61 @@
<version>${ruoyi.version}</version>
</dependency>
- <!-- 閫氱敤宸ュ叿-->
+ <!--鍩虹妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
+ <artifactId>basic-server</artifactId>
<version>${ruoyi.version}</version>
</dependency>
+ <!--涓氬姟妯″潡-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>inspect-server</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--缁╂晥妯″潡-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>performance-server</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas鏍囧噯鐗╄川-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-require</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas浣撶郴绠＄悊瑕佹眰-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-manage</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas璁惧绠＄悊-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-device</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas璧勬簮瑕佹眰-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-process</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas浜哄憳-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-personnel</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
<!-- minio -->
<dependency>
@@ -253,6 +296,13 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
+ </dependency>
+
+ <!-- poi-tl鍖呯敓鎴愭姤鍛� -->
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
+ <version>${poi.tl.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -325,21 +375,23 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>2.0.23</version>
+ <version>${fastjson.version}</version>
</dependency>
</dependencies>
<modules>
- <module>ruoyi-admin</module>
+ <module>ruoyi-admin-ztns</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
<module>inspect-server</module>
<module>performance-server</module>
<module>cnas-require</module>
+ <module>cnas-manage</module>
+ <module>cnas-device</module>
+ <module>cnas-process</module>
+ <module>cnas-personnel</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3