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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -541,8 +541,8 @@
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown" class="TC-dropdown">
-                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,0)">系列团修改</el-dropdown-item>
-                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager3',item.ID,item.TCID)">当团修改</el-dropdown-item>
+                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0)">系列团修改</el-dropdown-item>
+                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,item.TCID)">当团修改</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>

src/components/systemManagement/currencyManagement.vue

@@ -160,8 +160,8 @@
                     <th>{{$t('fnc.sfbenweibi')}}</th>
                     <th>{{$t('fnc.chushihuilv')}}</th>
                     <th>{{$t('fnc.benqihuilv')}}</th>
-                    <th>现汇买入价</th>
                     <th>现钞买入价</th>
+                    <th>现汇买入价</th>
                     <th>现钞卖出价</th>
                     <th>现汇卖出价</th>
                     <th>上调汇率</th>