Merge branch 'zwg' into dev

src/page/main/system/role/index.vue

@@ -339,6 +339,9 @@ const changeSearch = (val) => {
 } // 表格关键字筛选
 
 const changeUseRow = (row) => {
+  if (row.role_type == 1 || row.role_type == 2) {
+    return
+  }
   axios
     .post(`/apaas/system/v5/role/state/${row.id}/${row.state}`)
     .then((res) => {