From 46670e34c1105649da6091a0829b9451c9fe5b37 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 07 May 2018 14:44:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/alarm/AlarmStyle.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/alarm/AlarmStyle.java b/src/main/java/com/moral/entity/alarm/AlarmStyle.java
index cf21124..771b58a 100644
--- a/src/main/java/com/moral/entity/alarm/AlarmStyle.java
+++ b/src/main/java/com/moral/entity/alarm/AlarmStyle.java
@@ -2,5 +2,5 @@
public enum AlarmStyle {
//���������������������������������
- weixin,email,sms,vioce
+ weixin,email,sms,voice
}
--
Gitblit v1.8.0