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

许鹏程

2025-05-20 13ae71b985ad95d3953e14f6e7cc1564b2fdd78e

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

 pom.xml

@@ -44,7 +44,8 @@
        <module>product-server-tool-face</module>
        <module>product-server-mobile-core</module>
        <module>product-server-hr</module>
        <module>product-server-tool-conduct</module>
        <module>product-server-project-base</module>
        <module>product-server-project-contract</module>
    </modules>
    <properties>
        <skipTests>true</skipTests>
@@ -156,6 +157,11 @@
            </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>
@@ -187,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>
@@ -446,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-->

@@ -892,7 +913,14 @@
            <artifactId>sigar</artifactId>
            <version>1.6.4</version>
        </dependency>

        <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>