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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java

@@ -9,7 +9,7 @@


import com.yeshi.fanli.dao.mybatis.SMSHistoryMapper;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.exception.SMSException;

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

import com.yeshi.fanli.service.inter.user.SMSService;

import com.yeshi.fanli.util.AliyunSMSUtil;

import com.yeshi.fanli.util.Constant;