From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0bfe39d..2b54948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
<module>standard-server</module>
<module>inspection-server</module>
<module>laboratory-server</module>
+ <module>cnas-server</module>
</modules>
<properties>
@@ -32,11 +33,12 @@
<swagger.version>3.0.0</swagger.version>
<knife4j-spring-ui.version>3.0.3</knife4j-spring-ui.version>
<druid.version>1.2.18</druid.version>
- <mybatis-plus.version>3.4.0</mybatis-plus.version>
+ <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<openfeign.version>3.1.3</openfeign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<shiro.version>1.5.3</shiro.version>
-
+ <commons.lang3>3.12.0</commons.lang3>
+ <hutool.version>5.8.18</hutool.version>
<!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
<package.path>${project.build.directory}/LIMS</package.path>
</properties>
@@ -88,6 +90,12 @@
</dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
<!--log4j-->
<dependency>
<groupId>log4j</groupId>
--
Gitblit v1.9.3