Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageA/product/business_buy.vue

@@ -27,7 +27,7 @@
 		<view   class="c-row b-b ">
 			<view class="title">收货库</view>
 			<view class="con-list">
-				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}{{purchaseOrder.receiveWarehouse}}</view>
+				<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
 			</view>
 		</view>
 		<view v-if='companyId!=2' class="c-row b-b">

pageA/product/business_sale.vue

@@ -27,7 +27,7 @@
 		<view   class="c-row b-b ">
 			<view class="title">出货库</view>
 			<view class="con-list">
-				<view class="title">{{purchaseOrder.sendPrivate}}{{purchaseOrder.sendCity}}{{purchaseOrder.sendArea}}{{purchaseOrder.sendWarehouse}}</view>
+				<view class="title">{{purchaseOrder.sendWarehouse}}</view>
 			</view>
 		</view>
 		<view v-if='companyId!=2' class="c-row b-b">