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

src/views/system/role/index.vue

@@ -301,7 +301,7 @@ export default {
         {
           value: "5",
           label: "仅本人数据权限"
-        }
+        },
         {
           value: "6",
           label: "库管数据权限"