Merge branch 'dev' into d_ls

src/views/systemManagement/roleManagement/index.vue

@@ -318,11 +318,11 @@ export default {
           prop: "menuIds",
           scope: "tree",
         },
-        // {
-        //   label: "数据池权限",
-        //   prop: "keys",
-        //   scope: "treeInfo",
-        // },
+        {
+          label: "数据池权限",
+          prop: "keys",
+          scope: "treeInfo",
+        },
         {
           label: "备注",
           prop: "remark",