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

admin

2019-09-10 6671279208f1dc96df8bb437f9009bdabe0df497

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java

@@ -11,7 +11,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

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

import com.yeshi.fanli.exception.SMSException;

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

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

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

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