Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java

@@ -666,6 +666,7 @@
      GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);

      if (goodsClass == null) {

         out.print(JsonUtil.loadFalseResult("不存在该分类"));

         return;

      }



      if (page < 1)