Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-26 8f84f110e635237eace24f0077e9ab8f6b53d480

 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 {