From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index 80e5090..b391a9f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -23,9 +23,7 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.wx.WXUtil;
-import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
-import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.CustomerContent;
@@ -147,20 +145,6 @@
model.addAttribute("couponList", collection);
model.addAttribute("proportion", proportion);
return "coupon";
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriendsCount")
- public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
-
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
-
}
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
--
Gitblit v1.8.0