Merge remote-tracking branch 'origin/dev' into dev

许鹏程

2025-02-14 f02ffe1f30badc6710a2dc13955ea21017db408b

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pom.xml

 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>