Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

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

@@ -103,7 +103,7 @@
      UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);

      try {

         String relationId = null;

         if (extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null

         if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null

               && extraInfo.getRelationValid() == true)

            relationId = extraInfo.getRelationId();

         TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);