Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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