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

yujian

2019-06-25 bcbd93bb2239423aecba4e93ffba2e96ab873390

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

@@ -215,11 +215,7 @@


      } catch (Exception e) {

         errCode = 4;

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

         LogHelper.errorDetailInfo(e);

      }



      try {