mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-10-31 10:18:43 +08:00 
			
		
		
		
	Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts: src/api/system/area/index.ts src/views/system/area/index.vue
This commit is contained in:
		| @@ -66,9 +66,9 @@ const toDocument = () => { | ||||
|           <Icon icon="ep:menu" /> | ||||
|           <div @click="toDocument">{{ t('common.document') }}</div> | ||||
|         </ElDropdownItem> | ||||
|         <ElDropdownItem divided> | ||||
|         <ElDropdownItem divided @click="loginOut"> | ||||
|           <Icon icon="ep:switch-button" /> | ||||
|           <div @click="loginOut">{{ t('common.loginOut') }}</div> | ||||
|           <div>{{ t('common.loginOut') }}</div> | ||||
|         </ElDropdownItem> | ||||
|       </ElDropdownMenu> | ||||
|     </template> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV