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

doum

2 天以前 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4

 admin/src/views/business/tmsFactoryParam.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe