Merge branch 'develop' into devTee
# Conflicts: # src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue # src/modules/11_discipline/components/PopupSendToNext.vue
This commit is contained in:
commit
fddb0f7dc4
19 changed files with 274 additions and 155 deletions
|
|
@ -15,7 +15,7 @@ import type {
|
|||
FormData,
|
||||
Director,
|
||||
PersonsArray,
|
||||
} from "@/modules/11_discipline/interface/request/disciplinary";
|
||||
} from "@/modules/11_discipline/interface/request/Disciplinary";
|
||||
import type {
|
||||
DataOption,
|
||||
FileLists,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue