Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/11_discipline/interface/index/Main.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-10-18 13:39:17 +07:00
commit dd89933261
13 changed files with 451 additions and 290 deletions

View file

@ -2,6 +2,13 @@ interface DataOption {
id: string;
name: string;
}
interface investigatefactsDataRowType {
subject: string;
interrogated: string;
fault: string;
status: string;
active: string;
}
interface MyObjectRef {
orderType: any;
orderBy: any;
@ -15,7 +22,12 @@ interface MyObjectRef {
mistakeDetail: any,
[key: string]: any;
}
export type {
DataOption,
MyObjectRef
investigatefactsDataRowType,
MyObjectRef,
};