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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

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

@@ -5,7 +5,6 @@


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Service;



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