From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
index 1b88c57..2f6c099 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
@@ -40,7 +40,7 @@
* @param page
* @param out
*/
- @RequestMapping(value = "getCouponList", method = RequestMethod.GET)
+ @RequestMapping(value = "getCouponList")
public void getCouponList(AcceptData acceptData, String callback, int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCoupons = taoBaoCouponService.getTaoBaoCouponListBykeys(null, page);
int count = taoBaoCouponService.getCount("");
--
Gitblit v1.8.0