Merge remote-tracking branch 'origin/master'

yujian

2019-01-28 7bce608e9006c95bf15fb8c8c487c905c1599bd2

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

@@ -62,6 +62,11 @@
         return;

      }



	
			
			
		


      //

      UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);

      if ("share".equalsIgnoreCase(source)) {

@@ -95,6 +100,6 @@
      if (first)

         out.print(JsonUtil.loadTrueResult(data));

      else

         out.print(JsonUtil.loadTrue(0, data, "绑定淘宝失败"));

         out.print(JsonUtil.loadTrue(0, data, "淘宝授权未成功，请稍后再试"));

   }

}