From b651fb598b4da4ffa734a372e8d1b0b01eeef3fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 16:10:19 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index be43293..63a7206 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/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));
--
Gitblit v1.8.0