冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

 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));

   }