diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
index 1c265ce8d..8e1a35c50 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
@@ -72,16 +72,24 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "区分类型")
 	private Integer distinguish;
+
 	/**
-	 * 发货单位
+	 * 服务仓库
 	 */
-	@ApiModelProperty(value = "发货单位")
-	private String forwardingUnit;
+	@ApiModelProperty(value = "服务仓库ID")
+	private String serveWarehouseId;
+	@ApiModelProperty(value = "服务仓库Name")
+	private String serveWwarehouseName;
+
+
 	/**
-	 * 服务仓库
+	 * 发货仓库 发货仓库客户允许未null
 	 */
-	@ApiModelProperty(value = "服务仓库")
-	private String warehouseService;
+	@ApiModelProperty(value = "发货仓库ID")
+	private String sendWarehouseId;
+	@ApiModelProperty(value = "发货仓库Name")
+	private String sendWarehouseName;
+
 
 	/**
 	 * 门店ID
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
index 7513f179a..88478b90b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
@@ -60,8 +60,8 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 
 		List<BasicdataStorageServicesEntity> basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.<BasicdataStorageServicesEntity>query().lambda().
 			eq(BasicdataStorageServicesEntity::getShopId, basicdataStorageServices.getShopId()).
-			eq(BasicdataStorageServicesEntity::getForwardingUnit, basicdataStorageServices.getForwardingUnit()).
-			eq(BasicdataStorageServicesEntity::getWarehouseService, basicdataStorageServices.getWarehouseService())
+			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()).
+			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId())
 		);
 		if(basicdataStorageServicesEntities.size() > 0){
 			throw new RuntimeException("存在重复数据！已拒绝！！");