Merge branch 'dev' into master

# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml
2026-01-07 15:04:36 +08:00
parent 29b24e8450 3ec71c4a88
commit af7dda73de
30 changed files with 726 additions and 39 deletions
@@ -20,19 +20,19 @@ spring:
      discovery:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        #线上正式环境
        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
+        #线上正式环境
+#        server-addr: 10.102.192.105:6848
      config:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        #线上正式环境
        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
+        #线上正式环境
+#        server-addr: 10.102.192.105:6848
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -96,7 +96,7 @@
        FROM
            user_shipper s
                LEFT JOIN
-            "user" u
+            "USER" u
            ON u.user_id = s.user_id
        <where>
            <if test="topOrganizationId != null "> and u.top_organization_id = #{topOrganizationId}</if>
@@ -117,7 +117,7 @@
        FROM
        user_shipper s
        LEFT JOIN
-        "user" u
+        "USER" u
        ON u.user_id = s.user_id and u.del_flag = 1
        <where>
            s.del_flag = 1 and  s.shipper_fill = 3
@@ -411,7 +411,7 @@
        a.user_account,
        a.avatar
        FROM
-        "user" a
+        "USER" a
        WHERE
        a.del_flag = 1
        <include refid="common_where1"></include>
@@ -658,7 +658,7 @@
            us.shipper_enterprise_name,
            us.shipper_type
        FROM
-            "user" u
+            "USER" u
                LEFT JOIN user_shipper us ON u.user_id = us.user_id
        WHERE
            u.del_flag = 1
@@ -676,7 +676,7 @@
            ude.driver_enterprise_name,
            ude.driver_type
        FROM
-            "user" u
+            "USER" u
                LEFT JOIN user_driver_enterprise ude ON u.user_id = ude.user_id
        WHERE
            u.del_flag = 1
@@ -700,7 +700,7 @@
        a.user_account,
        a.avatar
        FROM
-        "user" a
+        "USER" a
        WHERE
          a.del_flag = 1
          and a.top_organization_id = #{topOrganizationId}
@@ -139,7 +139,7 @@
 			    b.monthly_settlement_flag,
 			    a.user_auth_status,
               b.original_receipt_flag,
-               b.freight_node,b.customer_nc_code
+               b.freight_node,b.customer_nc_code,b.settlement_currency
        FROM "USER" a
                 LEFT JOIN user_shipper b ON a.user_id = b.user_id
                                left join (select user_id, LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
@@ -191,7 +191,7 @@
        b.shipper_enterprise_fill,
        a.business_type
        FROM
-        "user" a
+        "USER" a
        LEFT JOIN user_shipper b ON b.user_id = a.user_id
        LEFT JOIN user_role ur ON b.user_id = ur.user_id
        LEFT JOIN role r ON ur.role_id = r.role_id