Merge branch 'enterprise_fix' into cmsLogin

src/pages/Role/manage-role.vue

 <template>
   <layout>
-    <RoleList appId="merchant-op" detailPath="/op/roleRoleDetail"></RoleList>
+    <RoleList detailPath="/op/roleRoleDetail"></RoleList>
   </layout>
 </template>
 <script>

src/pages/User/userList/index.vue

 <template>
   <layout>
-    <UserList appId="merchant-op" />
+    <UserList />
   </layout>
 </template>