hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-15 11:25:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source 
 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:
YunaiV
2023-03-28 23:57:47 +08:00
parent ce936ed296 c65a9d92bb
commit 03db8fece4
4 changed files with 142 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/infra/fileConfig/index.ts
View File

@ -17,7 +17,7 @@ export interface FileClientConfig {
export interface FileConfigVO {
id: number
name: string
storage: number
storage: any
master: boolean
visible: boolean
config: FileClientConfig