From 5e88359d7210039a6b1525bd5ffc20f24f2b5e01 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 08 五月 2019 16:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java
index fb5790e..e86b39b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java
@@ -55,4 +55,10 @@
 	 */
 	int getMaxOrder();
 	
+	/**
+	 * 鑾峰彇鏈夋晥鍒嗙被
+	 * @return
+	 */
+	List<GoodsClass> getEffectiveClass();
+	
 }

--
Gitblit v1.8.0