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

mhd_finance/pom.xml

@@ -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>

mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml

@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <!--<update id="updateCreditLimit">
-        UPDATE `account_cash_wallet` SET `credit_limit` =
+        UPDATE account_cash_wallet SET credit_limit =
             CASE
-                WHEN `credit_limit` - #{creditLimit} >= 0 THEN `credit_limit` - #{creditLimit}
+                WHEN credit_limit - #{creditLimit} >= 0 THEN credit_limit - #{creditLimit}
                 ELSE credit_limit
             END
         WHERE user_id = #{userId}

mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml

@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COUNT( 1 ) waybillCount,
         waybill_source_name
         FROM
-        `business_document`
+        business_document
         where del_flag = 1
         <include refid="selectBusinessDocumentPo1"/>
         GROUP BY
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       	SELECT
 			a.*
 		FROM
-			`business_document` a
+			business_document a
 			LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
 			LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
 		WHERE

mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml

@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
 			a.*
 		FROM
-			`business_document_detali` a
+			business_document_detali a
 			LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
 			LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
 		WHERE

mhd_finance/src/main/resources/mapper/loanManage/LoanManageMapper.xml

@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             image_url
         FROM
-            `loan_image`
+            loan_image
         WHERE
             loan_id =  #{values} and del_flag = 1
     </select>