From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFlashSaleServiceImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFlashSaleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFlashSaleServiceImpl.java
index 816b207..467e731 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFlashSaleServiceImpl.java
+++ b/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;

--
Gitblit v1.8.0