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/service/impl/lable/MergeClassServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/MergeClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/MergeClassServiceImpl.java
index 0545892..c659aae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/MergeClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/MergeClassServiceImpl.java
@@ -7,7 +7,7 @@
 
 import com.yeshi.fanli.dao.mybatis.lable.MergeClassMapper;
 import com.yeshi.fanli.entity.bus.lable.MergeClass;
-import com.yeshi.fanli.exception.MergeClassException;
+import com.yeshi.fanli.exception.goods.MergeClassException;
 import com.yeshi.fanli.service.inter.lable.MergeClassService;
 
 @Service

--
Gitblit v1.8.0