Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 f2b0c39642daf84c37b728d8d5553e866908faf1

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