From debb3a579f798d71072f037f74e3e6b43b5fe0ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 四月 2019 10:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
index 2114953..0a61ea3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
@@ -53,10 +53,10 @@
 
 
 	@RequestMapping(value = "queryAll")
-	public void queryAll(String callback, String platform, String packages, PrintWriter out) {
+	public void listquery(String callback,  PrintWriter out) {
 
 		try {
-			List<GoodsClass> goodsClassList = goodsClassService.queryAll(platform, packages);
+			List<GoodsClass> goodsClassList = goodsClassService.listquery();
 
 			if (goodsClassList == null || goodsClassList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));

--
Gitblit v1.8.0