Merge branch 'master-bug'

yujian

2019-07-16 aa66729ef758105dc1ced739ffe88e253affc37a

 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;