From 2dc52e3ba49433a54368c3b64ba3539b4bb051ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 16:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicController.java
index 43efc50..616cd94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicController.java
@@ -131,7 +131,7 @@
 	}
 
 	@RequestMapping(value = "getList", method = RequestMethod.POST)
-	public void getList2(AcceptData acceptData, Integer page, Long cid, Long subId, PrintWriter out) {
+	public void getList(AcceptData acceptData, Integer page, Long cid, Long subId, PrintWriter out) {
 		try {
 			if (cid == null) {
 				out.print(JsonUtil.loadFalseResult("涓诲垎绫籭d涓嶈兘涓虹┖"));

--
Gitblit v1.8.0