Merge remote-tracking branch 'origin/master'

admin

2019-02-27 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java

@@ -14,7 +14,6 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;