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

2021-12-02 20:45:14 +08:00
parent 5f4d220976 db5ccdca74
commit 9339df7bef
9 changed files with 772 additions and 371 deletions
@@ -150,7 +150,7 @@
                   :loading="delLoading"
                   size="mini"
                   @click="deleteStand(2)"
-                   v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
+                   v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'"><i class="iconfont">&#xe61b;</i>批量删除
        </el-button>
        <el-button class="common-button-default"
                   size="mini"