Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-22 1011d9d0aaab0e978caf4513b64f0a369bcd9a96

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

@@ -297,7 +297,6 @@
               data.put("type", 1);

               data.put("link", link);

               data.put("native", true);



            } catch (Exception e1) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];