Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

 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;