Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 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("暂无数据"));