From 86a2151330d950698d0cadfbe5a2536d63ca2b48 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Tue, 17 Mar 2026 15:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=98=E8=BF=90=E6=96=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/user/domain/userAggregate/entity/UserShipperEntity.java | 2 +- .../domain/userAggregate/repository/todo/UserShipperDO.java | 2 +- .../java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java | 2 +- mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java index 4c56f5b4d..c3e4a8879 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java @@ -205,7 +205,7 @@ public class UserShipperEntity extends BaseVOEntity { private String userMemberCode; @ApiModelProperty("货主/供应商/客户名称") - private String userName; + private String userNameShipper; @ApiModelProperty("联系人") private String emergencyContactName; diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java index 0370e958d..d58dc3547 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java @@ -239,7 +239,7 @@ public class UserShipperDO extends UserDO { private String userMemberCode; @ApiModelProperty("货主/供应商/客户名称") - private String userName; + private String userNameShipper; @ApiModelProperty("联系人") private String emergencyContactName; diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java index d64e7c498..27944fa50 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java @@ -202,7 +202,7 @@ public class UserShipperDTO extends UserDTO { private String userMemberCode; @ApiModelProperty("货主/供应商/客户名称") - private String userName; + private String userNameShipper; @ApiModelProperty("法人代表") private String legalRepresentative; diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 5633a737e..2fd26873f 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -145,7 +145,7 @@ b.freight_node,b.customer_nc_code,b.settlement_currency, b.role_code as roleCodeShipper, b.user_member_code, - b.user_name as userNameShipper, + b.user_name_shipper as userNameShipper, b.emergency_contact_name, b.emergency_contact_phone, b.user_area_county_id as userAreaCountyIdShipper,