Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

1
2
3
4
5
6
package com.moral.entity.alarm;
 
public enum AlarmStyle {
    //微信，邮件，短信，语音
    weixin,email,sms,voice
}