Merge branch 'master' into div

yujian

2019-07-16 b651fb598b4da4ffa734a372e8d1b0b01eeef3fa

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -540,7 +540,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -668,7 +668,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -780,7 +780,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));