Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java

@@ -669,15 +669,5 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库干仓配成本")
 	private String warehouseDeliveryCost;
-	/**
-	 * 中转仓代入成本
-	 */
-	@ApiModelProperty(value = "中转仓代入成本")
-	private String warehouseInCost;
-	/**
-	 * 中转仓代出成本
-	 */
-	@ApiModelProperty(value = "中转仓代出成本")
-	private String warehouseOutCost;
 
 }