Merge branch 'mater-1.6.0' into div

admin

2019-08-21 0f3fc66c7e2b234411e2f1b35671e7a547cdfd44

 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;