Merge branch 'seven' into d_ls

src/views/Marketing/goods/spec/compoent/configTable.vue

@@ -4,7 +4,7 @@
       :tableSets="backSet(1)"
       :tableData="tableData"
       :navText="backNavText(false)"
-      :objectSpanMethod="objectSpanMethod"
+      :objectSpanMethod="tableData.length > 1 ? objectSpanMethod : () => {}"
       :loading="loading"
     >
       <template slot="btn" slot-scope="scope">
@@ -258,7 +258,7 @@ export default {
         choice: false,
         choiceRadio: choice,
         radioKey: "goodsId",
-        addHide: !false,
+        addHide: true,
         tableHide: choice,
         dontNum: true,
         headShow: false,