Merge remote-tracking branch 'origin/master'

yujian

2019-05-24 c314495f8971d7ff6926e8c9d49f9e6817c4f20a

 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java

@@ -73,7 +73,6 @@
      }

      if (label.getId() == null)// 新增

      {



         if (label.getGoodsClass().getId() == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("分类不能为空"));

            return;