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 | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21adf16..49564eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
<module>product-server-device</module>
<module>product-server-tool-face</module>
<module>product-server-mobile-core</module>
- <module>product-project-server-contract</module>
- <module>product-server-project-base</module>
+ <module>product-server-hr</module>
+ <module>product-server-tool-conduct</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -75,7 +75,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.version>2.0.0-release</project.build.version>
<product-module-version>2.0.0-release</product-module-version>
- <product-core-version>2.1.1-release</product-core-version>
+ <product-core-version>2.1.2-release</product-core-version>
</properties>
<repositories>
<repository>
@@ -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>
@@ -281,6 +286,11 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-datasource</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
<version>${product-module-version}</version>
</dependency>
<!--瀛愭ā鍧楋細end-->
@@ -871,10 +881,11 @@
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
</dependency>
</dependencies>
</project>
--
Gitblit v1.9.2