Merge remote-tracking branch 'origin/master'

src/views/component/taocans.vue

@@ -10,12 +10,12 @@
       size="max"
       :span-method="objectSpanMethod"
 
-    >     <el-table-column
+    >    
+     <el-table-column
           prop="tao_can_ming_chen"
           label="套餐名称"
           key="tao_can_ming_chen"
           align="center"
-          highlight-current-row:'true'
           :width=" 120 "
         >
       </el-table-column>