From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
index d0040d4..1896322 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
+++ b/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;

--
Gitblit v1.8.0