Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -117,7 +117,7 @@
            if (StringUtil.isNullOrEmpty(relationId)) {

               LogHelper.test(uid + "渠道备案失败");

               bindInfo = false;

            } 
            }

            

            String specialId = null;

            if(bindInfo) {