weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-03-18 17:41:20 +08:00
parent 347c3dc4c7 775ed74712
commit bbf26efb15
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/interfaces/assember/UserShipperAssember.java
+3 -3
View File
@@ -22,13 +22,13 @@ public class UserShipperAssember {
if (StringUtils.isEmpty(shipperDO.getUserName())){ if (StringUtils.isEmpty(shipperDO.getUserName())){
shipperDO.setUserName(userShipperDTO.getUserNameShipper()); shipperDO.setUserName(userShipperDTO.getUserNameShipper());
} }
if (StringUtils.isEmpty(userShipperDTO.getEmergencyContactName())){ if (StringUtils.isEmpty(shipperDO.getEmergencyContactName())){
shipperDO.setEmergencyContactName(userShipperDTO.getUserNameShipper()); shipperDO.setEmergencyContactName(userShipperDTO.getUserNameShipper());
} }
if (StringUtils.isEmpty(userShipperDTO.getEmergencyContactPhone())){ if (StringUtils.isEmpty(shipperDO.getEmergencyContactPhone())){
shipperDO.setEmergencyContactPhone(userShipperDTO.getUserPhone()); shipperDO.setEmergencyContactPhone(userShipperDTO.getUserPhone());
} }
if (StringUtils.isEmpty(userShipperDTO.getUserMemberCode())){ if (StringUtils.isEmpty(shipperDO.getUserMemberCode())){
shipperDO.setUserMemberCode(userShipperDTO.getUserMemberCode()); shipperDO.setUserMemberCode(userShipperDTO.getUserMemberCode());
} }
return shipperDO; return shipperDO;