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

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

 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 {