Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 d029dafc262bc3c8ddc8ca6b85e4fa6e073d764a

 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 {