Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2 天以前 e2317a1bcab0134f0c1b1aec99eb4d78dfddf1b8

 src/views/basicData/product/index.vue

@@ -73,7 +73,7 @@
        <el-button type="primary" @click="openModelDia('add')">
          新增规格型号
        </el-button>
        <ImportExcel @uploadSuccess="getModelList" />
        <ImportExcel :product-id="currentId" @uploadSuccess="getModelList" />
        <el-button
          type="danger"
          @click="handleDelete"