From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
index 65bda92..878bd8c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
@@ -5,7 +5,7 @@
 import org.springframework.cache.annotation.Cacheable;
 
 import com.yeshi.fanli.entity.bus.lable.MergeClass;
-import com.yeshi.fanli.exception.MergeClassException;
+import com.yeshi.fanli.exception.goods.MergeClassException;
 
 public interface MergeClassService {
 	

--
Gitblit v1.8.0