Merge branch 'dev' into 'master'

调整

See merge request motive-power/yxl/yxl-web-admin-frontend!30

src/views/systemManagement/accountManagement/modal/RoleModal.vue

@@ -77,7 +77,7 @@ export default {
         id: this.id
       });
       if (success) {
-        this.form.roles = data;
+        this.form.roles = data.map(x => x.code);
       }
     },