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

admin

2019-10-29 54ae34b91644b02c422b41197ae6ce33f4e3ca57

 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;