Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 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'