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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 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);