merge

src/views/permissions/permission.vue

@@ -807,12 +807,12 @@ const getLists = async function () {
 
       }
       console.log('addRoleMarket.value', addRoleMarket.value);
-    } else{
-      if (typeof market.value === 'string' && market.value) {
-        addRoleMarket.value = market.value.split(',');
+    } else {
+      if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
+        addRoleMarket.value = adminData.value.markets.split(',');
         addRole.value.market = ''
-      } else if (Array.isArray(market.value)) {
-        addRoleMarket.value = market.value
+      } else if (Array.isArray(adminData.value.markets)) {
+        addRoleMarket.value = adminData.value.markets
         addRole.value.market = ''
       }
       else {