fix:合并代码

2.修改页面入库的没有参数的情况

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java

@@ -99,6 +99,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 			BusinessSanDTO businessSanDTO = new BusinessSanDTO();
 			businessSanDTO.setOrderPackageCode(distributionBusinessPreOrderEntity.getOrderPackageCode());
 			businessSanDTO.setInWarehouseException(0);
+			businessSanDTO.setConditions(distributionBusinessPreOrderEntity.getConditions()+"");
 			businessSanDTO.setDistrCarNumber(distributionBusinessPreOrderEntity.getDistrCarNumber());
 			R r = inOrderWarehourse(businessSanDTO);
 			if (r.isSuccess()) {