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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;



/**

 * 紧急告警