Merge branch 'dm_20251204' into dev

# Conflicts: # mhd-user-center/src/main/resources/mapper/UserMapper.xml # mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
2025-12-06 22:15:26 +08:00
parent 8527d24d48 5b2212d5db
commit 2a1e542704
63 changed files with 314 additions and 257 deletions
@@ -73,9 +73,14 @@
            <groupId>com.mhd</groupId>
            <artifactId>mhd-common-redis</artifactId>
        </dependency>
-        <dependency>
+        <!--<dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
        </dependency>
        <!--添加druid连接池 依赖 -->
        <dependency>