From f02ffe1f30badc6710a2dc13955ea21017db408b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 14 二月 2025 14:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index eeb72db..49564eb 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,8 @@
<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-tool-conduct</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -148,6 +148,11 @@
<version>2.1.0-release</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>
@@ -288,24 +293,6 @@
<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-->
@@ -894,10 +881,11 @@
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
+
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.10.0</version>
- </dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.2