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

admin

2019-08-05 1cb3ee82ab49b221be2c4ec65bc70bc354fc8d8b

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

@@ -10,8 +10,6 @@
import org.yeshi.utils.JsonUtil;



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

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

import com.yeshi.fanli.exception.SMSException;

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