冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

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

@@ -8,9 +8,9 @@
import java.util.Map;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.TaoBaoClassRelationMapper;

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