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/ShareControllerV2.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 2006852..57321ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -11,8 +11,8 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.core.task.TaskExecutor;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
@@ -76,6 +76,8 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+
+@Controller
@RequestMapping("api/v2/share")
public class ShareControllerV2 {
@@ -147,7 +149,7 @@
* @param recordId
* @param out
*/
- @RequestMapping(value = "getShareGoods", method = RequestMethod.POST)
+ @RequestMapping(value = "getShareGoods")
public void getShareGoods(AcceptData acceptData, Long recordId, PrintWriter out) {
if (recordId == null) {
--
Gitblit v1.8.0