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

admin

2019-07-31 5046ecde3cd849511a337e25e13af7df7f1894bc

 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java

@@ -114,7 +114,7 @@
            String relationId = null;



            try {

               TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

               relationId=   TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                     TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 渠道ID

            } catch (TaoBaoAuthException e) {

               if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)