Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

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