Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wang

2024-04-19 44051709072ff59407c9ce4592abe15d76c6128d

 hangzhoumesParent/common/pom.xml

@@ -6,6 +6,7 @@
        <artifactId>hangzhoumesParent</artifactId>
        <groupId>com.mes</groupId>
        <version>1.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -43,13 +44,13 @@
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.2.0</version>
            <version>3.3.1</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
            <version>3.2.0</version>
            <version>3.3.1</version>
        </dependency>

        <dependency>
@@ -171,6 +172,12 @@
            <version>1.2.33</version>
        </dependency>

        <dependency>
            <groupId>com.github.yulichang</groupId>
            <artifactId>mybatis-plus-join</artifactId>
            <version>1.2.4</version>
        </dependency>

    </dependencies>