Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

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