Merge branch 'dev_mp' into dev

zhanghl

2025-05-13 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce

 aps-common/aps-common-core/pom.xml

@@ -53,11 +53,6 @@
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>

        <!-- Mybatis Spring -->
        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis-spring</artifactId>
        </dependency>

        <!-- Hibernate Validator -->
        <dependency>
@@ -125,6 +120,20 @@
            <artifactId>hutool-all</artifactId>
            <version>5.8.16</version>
        </dependency>
<!--                 Mybatis Spring -->
        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis-spring</artifactId>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-jsqlparser</artifactId>
        </dependency>
    </dependencies>

</project>