Merge remote-tracking branch 'origin/div' into div

admin

2019-08-03 84c07b26025cb0790d089b0d397f80b941bcdf88

 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;