From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
index 64ca441..fdaeb37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
@@ -26,7 +26,7 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.exception.LabelException;
+import com.yeshi.fanli.exception.goods.quality.LabelException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
@@ -61,7 +61,6 @@
*/
@RequestMapping(value = "saveAdd")
public void saveAdd(String callback, Long uid, Label label, HttpServletRequest request, PrintWriter out) {
-
try {
String title = label.getTitle();
if (StringUtil.isNullOrEmpty(title)) {
--
Gitblit v1.8.0