From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
index eebbc9e..0828019 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
@@ -69,7 +69,7 @@
 		
 		JSONObject data = new JSONObject();
 		data.put("count", listNavbar.size());
-		data.put("listNavbar", listNavbar);
+		data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar));
 		
 		out.print(JsonUtil.loadTrueResult(data));
 	}

--
Gitblit v1.8.0