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

沈斌

2018-02-28 e86e4f95fcca349107237f8f4161b9c91e279af1

 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'