mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 04:08:44 +08:00 
			
		
		
		
	Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts: src/views/bpm/form/formEditor.vue src/views/bpm/model/index.vue src/views/infra/config/form.vue src/views/infra/config/index.vue src/views/infra/fileConfig/index.vue src/views/infra/fileList/index.vue src/views/system/mail/log/log.data.ts src/views/system/tenant/tenant.data.ts src/views/system/user/index.vue src/views/system/user/user.data.ts
This commit is contained in:
		@@ -43,7 +43,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
 | 
			
		||||
    {
 | 
			
		||||
      title: t('form.remark'),
 | 
			
		||||
      field: 'remark',
 | 
			
		||||
      isTable: false,
 | 
			
		||||
      isTable: true,
 | 
			
		||||
      isSearch: true,
 | 
			
		||||
      form: {
 | 
			
		||||
        component: 'Input',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user