From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
index df6ab21..61aa0d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
@@ -218,6 +218,12 @@
 	long countQueryByFlashSale();
 
 	/**
+	 * 闄愭椂绉掓潃 闅忔満3涓晢鍝�
+	 * @return
+	 */
+	List<QualityFactory> listFlashSaleRandGoods();
+	
+	/**
 	 * 杩斿埄閲戦鏁版嵁鏌ヨ
 	 * 
 	 * @param start

--
Gitblit v1.8.0