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

许鹏程

2025-02-14 f02ffe1f30badc6710a2dc13955ea21017db408b

 pom.xml

@@ -44,6 +44,7 @@
        <module>product-server-tool-face</module>
        <module>product-server-mobile-core</module>
        <module>product-server-hr</module>
        <module>product-server-tool-conduct</module>
    </modules>
    <properties>
        <skipTests>true</skipTests>
@@ -147,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>
@@ -875,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>