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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1102,9 +1102,9 @@
           showBtnList: false, //是否下载、确认按钮
           ShowTaxType: false, //显示税入税别
           ShowRebateRatio: false, //显示返佣比列
-          ShowSupplier: false, //是否显示供应商
+          ShowSupplier: true, //是否显示供应商
           showCaozuoTime: true, //操作时间
-          colspanLength: 4 //跨行
+          colspanLength: 5 //跨行
         },
         IsModifyTravelControl: 0, //分公司是否有修改团控权限
         pickerBeginDateBefore: {