Merge branch 'dev-2.2.0' of http://nonxin.cn:8090/r/product/product-server/...

6c

2025-07-18 23319b6d41906686ec3534601fde5e9b74338a72

 pom.xml

@@ -9,7 +9,7 @@
    </parent>
    <groupId>com.lx</groupId>
    <artifactId>product-server</artifactId>
    <version>2.0.0-release</version>
    <version>2.2.0-release</version>
    <packaging>pom</packaging>
    <name>product-server</name>
    <description>product-server</description>
@@ -44,8 +44,6 @@
        <module>product-server-tool-face</module>
        <module>product-server-mobile-core</module>
        <module>product-server-hr</module>
        <module>product-server-project-base</module>
        <module>product-server-project-contract</module>
    </modules>
    <properties>
        <skipTests>true</skipTests>
@@ -76,7 +74,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.2-release</product-core-version>
        <product-core-version>2.2.0-release</product-core-version>
    </properties>
    <repositories>
        <repository>
@@ -136,7 +134,7 @@
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-device</artifactId>
                <version>2.1.0-release</version>
                <version>2.2.0-release</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
@@ -156,8 +154,8 @@
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-tool-conduct</artifactId>
                <version>${product-module-version}</version>
                <artifactId>product-project-server-contract</artifactId>
                <version>2.2.0</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
@@ -247,7 +245,7 @@
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-data-sync</artifactId>
                <version>${product-module-version}</version>
                <version>2.2.0</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
@@ -447,7 +445,6 @@
                <version>4.12</version>
                <scope>test</scope>
            </dependency>
            <!-- https://mvnrepository.com/artifact/com.github.mwiede/jsch -->
            <dependency>
                <groupId>com.github.mwiede</groupId>
                <artifactId>jsch</artifactId>
@@ -482,6 +479,14 @@

            </exclusions>
        </dependency>

        <!-- Maven 示例 -->
        <dependency>
            <groupId>org.postgresql</groupId>
            <artifactId>postgresql</artifactId>
            <version>42.2.5</version> <!-- 使用最新版本 -->
        </dependency>

        <!--logo4j-->
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>