Merge remote-tracking branch 'origin/master'

hdy

2024-01-08 60ebb5f4610ce79742a3781c71f7eda4043b7fac

 pom.xml

@@ -9,7 +9,7 @@
    <version>3.8.6</version>

    <name>jcdm</name>
    <url>http://www.ruoyi.vip</url>
    <url>http://www.jcdm.vip</url>
    <description>江宸MES管理系统</description>
    
    <properties>
@@ -170,6 +170,19 @@
                <version>${jcdm.version}</version>
            </dependency>

            <!-- JCDM模块-->
            <dependency>
                <groupId>com.jcdm</groupId>
                <artifactId>jcdm-main</artifactId>
                <version>${jcdm.version}</version>
            </dependency>

            <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-pool2</artifactId>
                <version>2.12.0</version>
            </dependency>

        </dependencies>
    </dependencyManagement>

@@ -180,6 +193,7 @@
        <module>jcdm-quartz</module>
        <module>jcdm-generator</module>
        <module>jcdm-common</module>
        <module>jcdm-main</module>
    </modules>
    <packaging>pom</packaging>