From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/business/enum/types.enum.ts | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index b1a5157..7fdb678 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/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'
--
Gitblit v1.8.0