Merge remote-tracking branch 'origin/master'

src/views/user/darkRoom/index.vue

@@ -24,7 +24,7 @@
         style="margin-left: 5px"
         :disabled="ids.length === 0"
         @click="handleUpdateBatch"
-        v-hasPermi="['store:user:darkRoomList']"
+        v-hasPermi="['store:user:enabledUsers']"
       >批量启用</el-button>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>