Merge remote-tracking branch 'origin/dev'

d5139cbd · lvweichao · a2c5be19 · e5af4ade · d5139cbd · d5139cbd
Commit d5139cbd authored Jun 10, 2021 by lvweichao
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

add-role.vue src/pages/Role/add-role.vue +1 -1

manage-role.vue src/pages/Role/manage-role.vue +1 -1

No files found.
--- a/src/pages/Role/add-role.vue
+++ b/src/pages/Role/add-role.vue
@@ -121,7 +121,7 @@ export default {
    }

  },
-  created () {
+  activated () {
    this.getGetRole_list()
    this.getPermissionsAll()
  },

--- a/src/pages/Role/manage-role.vue
+++ b/src/pages/Role/manage-role.vue
@@ -189,7 +189,7 @@ export default {
      permissionsUpdate: []
    }
  },
-  created () {
+  activated () {
    this.getGetRole_list()
    this.getPermissionsAll()
  },