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

admin

2020-05-23 37e8ba46879a6094938ad685b1054eb6446ae749

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