mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 20:28:45 +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:
		@@ -128,7 +128,7 @@ const getColumnsConfig = (options: XTableProps) => {
 | 
			
		||||
    proxyForm = true
 | 
			
		||||
    options.formConfig = {
 | 
			
		||||
      enabled: true,
 | 
			
		||||
      titleWidth: 180,
 | 
			
		||||
      titleWidth: 110,
 | 
			
		||||
      titleAlign: 'right',
 | 
			
		||||
      items: allSchemas.searchSchema
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user