Merge branch 'refs/heads/dev_qinhongzhan' into dev

# 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/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java # mhd-user-center/src/main/resources/bootstrap.yml # mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java # mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
2026-01-10 16:45:38 +08:00
parent 3ec71c4a88 4b427e1b2e
commit f7e6f70321
104 changed files with 3099 additions and 537 deletions
@@ -114,7 +114,8 @@
               b.shipper_enterprisel_auth_id,
               a.user_phone,
               a.user_name,
-               a.organization_name,
+               a.organization_id AS organizationId,
+               a.organization_name AS organizationName,
               a.user_account,
               a.user_member_code,
               a.user_idcard_number,