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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -4501,6 +4501,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			isZeroType = true;
 		}
 		distrilbutionBillLading.setWarehouseName(warehouse.getName());
+		if (!Objects.isNull(distrilbutionBillLading.getConsigneeUnit())){
+			String consigneeUnit = distrilbutionBillLading.getConsigneeUnit();
+			distrilbutionBillLading.setConsigneeUnit(consigneeUnit);
+		}
+
 		this.save(distrilbutionBillLading);
 		//新增自提日志
 		// 创建备货任务