diff --git a/config/income_tbl.json b/config/income_tbl.json index 12bd629..f824b00 100644 --- a/config/income_tbl.json +++ b/config/income_tbl.json @@ -1 +1 @@ -[{"id":90001,"income":1,"income":"80029:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income":2,"income":"80030:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income":3,"income":"80031:1","repeat":1,"frequency":10,"interval":30},{"id":90004,"income":3,"income":"80031:1","repeat":1,"frequency":1,"interval":0}] \ No newline at end of file +[{"id":90001,"income_premiseID":1,"income":"80029:1","repeat":0,"frequency":0,"interval":0},{"id":90002,"income_premiseID":2,"income":"80030:1","repeat":0,"frequency":0,"interval":0},{"id":90003,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":10,"interval":30},{"id":90004,"income_premiseID":3,"income":"80031:1","repeat":1,"frequency":1,"interval":0}] \ No newline at end of file diff --git a/src/cfg/parsers/IncomeCfg.ts b/src/cfg/parsers/IncomeCfg.ts index fe4d1da..6beaab7 100644 --- a/src/cfg/parsers/IncomeCfg.ts +++ b/src/cfg/parsers/IncomeCfg.ts @@ -4,7 +4,7 @@ export class IncomeCfg implements Cfg{ name: "IncomeCfg"; public id: number; - public income: number; + public income_premiseID: number; public income: string; public repeat: number; public frequency: number; @@ -12,7 +12,7 @@ export class IncomeCfg implements Cfg{ public decode(data: any) { this.id = data.id; - this.income = data.income; + this.income_premiseID = data.income_premiseID; this.income = data.income; this.repeat = data.repeat; this.frequency = data.frequency;