Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-02-01 5562436e2898f5d013a2ccd7138d4dfe0888c5f5

 src/app/business/enum/types.enum.ts

@@ -1,7 +1,6 @@
export enum Types {
    Date, Json
}

export enum AlarmStyle {
    //微信，邮件，短信，语音
    weixin='weixin',email='email',sms='sms',voice='voice'