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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java

@@ -250,6 +250,8 @@


               if (taoBaoLink == null) {

                  taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);

                  if(taoBaoLink!=null)

                     clientTBPid=null;

               }



               data.put("native", true);