Merge branch 'develop' into devTee

# Conflicts: # src/modules/11_discipline/components/4_Result/Form.vue # src/modules/11_discipline/store/ResultStore.ts
2023-12-01 15:53:40 +07:00 · 2023-12-01 15:53:40 +07:00 · 4f84341a0b
commit 4f84341a0b
parent 5a28025906 ab15f989cc
21 changed files with 617 additions and 46 deletions
--- a/src/modules/11_discipline/interface/request/complaint.ts
+++ b/src/modules/11_discipline/interface/request/complaint.ts
@ -33,6 +33,7 @@ interface ArrayPerson {
    salary:number|null
    organization:string
 }
+
 interface ArrayFileList {
    id:string
    pathName:string