Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server/V2.0.0

shichongfu

2023-10-08 140c3b53f8ada8509c3ed271297cfef617640469

 pom.xml

@@ -41,7 +41,10 @@
        <module>product-server-tool-mvc</module>
        <module>product-server-tool-table</module>
        <module>product-server-util</module>
        <module>product-server-mobile-core</module>
      <module>product-server-device</module>
        <module>product-server-web</module>
        <module>product-server-device</module>
    </modules>
    <properties>
        <skipTests>true</skipTests>
@@ -72,6 +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-device-version>2.1.0-release</product-device-version>
    </properties>
    <repositories>
        <repository>
@@ -123,7 +127,11 @@
                <artifactId>product-server-core</artifactId>
                <version>2.0.1</version>
            </dependency>

            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-device</artifactId>
                <version>${product-module-version}</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-util</artifactId>
@@ -162,7 +170,7 @@
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-task</artifactId>
                <version>${product-module-version}</version>
                <version>${product-device-version}</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
@@ -264,9 +272,29 @@
                <artifactId>product-server-datasource</artifactId>
                <version>${product-module-version}</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-mobile-core</artifactId>
                <version>${product-module-version}</version>
            </dependency>
            <dependency>
               <groupId>com.lx</groupId>
               <artifactId>product-server-device</artifactId>
               <version>2.1.0-release</version>
           </dependency>
            <!--子模块：end-->

            <!--第三方依赖：start-->
           <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
            <version>1.10.5</version>
           </dependency>
            <dependency>
                <groupId>com.deepoove</groupId>
                <artifactId>poi-tl</artifactId>
                <version>1.10.5</version>
            </dependency>
            <dependency>
                <groupId>cn.hutool</groupId>
                <artifactId>hutool-all</artifactId>
@@ -847,5 +875,11 @@
            <artifactId>junit</artifactId>
            <scope>test</scope>
        </dependency>
        <!-- 文件编码识别工具 -->
      <dependency>
        <groupId>com.github.albfernandez</groupId>
        <artifactId>juniversalchardet</artifactId>
        <version>2.3.1</version>
      </dependency>
    </dependencies>
</project>