Merge remote-tracking branch 'origin/div' into div

admin

2019-10-19 a18310725c451260bd93090d47978968c5bd5f65

 fanli/src/main/java/com/yeshi/fanli/util/EmergencyUtil.java

@@ -3,7 +3,7 @@
import java.util.HashMap;

import java.util.Map;



import com.yeshi.fanli.exception.SMSException;

import com.yeshi.fanli.exception.config.SMSException;



/**

 * 紧急告警