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

doum

9 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 admin/src/views/operation/danger/typeSet.vue

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