From e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 10:30:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/business/entity/data.ts | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 93354c3..f56e676 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -83,6 +83,7 @@
export interface AlarmSensorLevel {
enable: boolean|any [];
increment: number []|any[];
+ degressEnable:boolean|any [];
degression: number []|any [];
}
export interface Device {
@@ -124,4 +125,11 @@
address:string;
describe:string;
name:string;
+}
+
+export interface UserContext {
+ authorities: any[];
+ mode: string;
+ organizationId: number;
+ username: string;
}
\ No newline at end of file
--
Gitblit v1.8.0