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

This commit is contained in:
王奎兴
2026-03-18 17:41:20 +08:00
@@ -22,13 +22,13 @@ public class UserShipperAssember {
if (StringUtils.isEmpty(shipperDO.getUserName())){
shipperDO.setUserName(userShipperDTO.getUserNameShipper());
}
if (StringUtils.isEmpty(userShipperDTO.getEmergencyContactName())){
if (StringUtils.isEmpty(shipperDO.getEmergencyContactName())){
shipperDO.setEmergencyContactName(userShipperDTO.getUserNameShipper());
}
if (StringUtils.isEmpty(userShipperDTO.getEmergencyContactPhone())){
if (StringUtils.isEmpty(shipperDO.getEmergencyContactPhone())){
shipperDO.setEmergencyContactPhone(userShipperDTO.getUserPhone());
}
if (StringUtils.isEmpty(userShipperDTO.getUserMemberCode())){
if (StringUtils.isEmpty(shipperDO.getUserMemberCode())){
shipperDO.setUserMemberCode(userShipperDTO.getUserMemberCode());
}
return shipperDO;