Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 f7fc1e040ca7533b0bece2a02eb72dd3645ed4d0

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelClassServiceImpl.java

@@ -6,10 +6,10 @@
import java.util.List;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.lable.LabelClassMapper;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;