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

admin

2020-03-15 b16f2b0126281e87346db9e6efd1db960ecc872a

 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