Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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