From 13ae71b985ad95d3953e14f6e7cc1564b2fdd78e Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 20 五月 2025 10:15:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index eeb72db..5a6279a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,7 @@
<packaging>pom</packaging>
<name>product-server</name>
<description>product-server</description>
-
- <modules>
+ <modules>
<module>product-server-web</module>
<module>product-server-admin</module>
<module>product-server-administration</module>
@@ -44,7 +43,9 @@
<module>product-server-device</module>
<module>product-server-tool-face</module>
<module>product-server-mobile-core</module>
- <module>product-server-hr</module>
+ <module>product-server-hr</module>
+ <module>product-server-project-base</module>
+ <module>product-server-project-contract</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -148,6 +149,22 @@
<version>2.1.0-release</version>
</dependency>
+
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-system-backup</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-system-backup</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-conduct</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
@@ -176,6 +193,11 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-mvc</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-conduct</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -288,27 +310,14 @@
<artifactId>product-server-hr</artifactId>
<version>${product-module-version}</version>
</dependency>
- <!--椤圭洰绠＄悊-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-contract</artifactId>
- <version>${product-module-version}</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-base</artifactId>
- <version>${product-module-version}</version>
- </dependency>
- <!--瑗垮畞-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-xining</artifactId>
- <version>${product-module-version}</version>
- </dependency>
-
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
+ <dependency>
+ <groupId>khzx-tzsb</groupId>
+ <artifactId>khzx-tzsb-maintenance-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>e-iceblue</groupId>
<artifactId>spire.doc.free</artifactId>
@@ -448,6 +457,16 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.2.25</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.9.0</version>
</dependency>
<!--绗笁鏂逛緷璧栵細end-->
@@ -895,9 +914,17 @@
<version>1.6.4</version>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.10.0</version>
- </dependency>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2