Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -497,7 +497,6 @@
                     {{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
                   <p>
                     <el-popover width="700" trigger="click" popper-class="TC_customerInfo">
-
                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
                         <tr>
                           <td rowspan="2" style="text-align:center" width="60">