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

pageD/warehousings/warehousings.vue

@@ -97,7 +97,7 @@
 				<view class="c-row b-b">
 					<text class="tit">入库日期</text>
 					
-					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=''?WarehouseInOutInfo.inOutDate:time1}}</view>
+					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=null?WarehouseInOutInfo.inOutDate:time1}}</view>
 					<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 					
 				</view>