Merge branch 'develop' into devTee
# Conflicts: # src/interface/request/main/main.ts # src/modules/09_leave/router.ts
This commit is contained in:
commit
580f8ac565
15 changed files with 930 additions and 307 deletions
|
|
@ -10,7 +10,6 @@ interface dataRowRound {
|
|||
amOut: string
|
||||
pm: string
|
||||
pmOut: string
|
||||
note: string
|
||||
status: boolean
|
||||
isDefault: boolean
|
||||
}
|
||||
|
|
@ -22,7 +21,6 @@ interface roundShow {
|
|||
pmOut: string;
|
||||
amRound: string;
|
||||
pmRound: string;
|
||||
note: string;
|
||||
status: boolean;
|
||||
isDefault: boolean;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue