From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Wed, 23 Dec 2020 13:55:07 +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