From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsClassMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 e86b39b..d08de33 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
@@ -47,7 +47,7 @@
 	GoodsClass getByAdjoinOrder(@Param("order") Integer order, @Param("type") Integer type);
 	
 	
-	List<GoodsClass> getGoodsClassAll();
+	List<GoodsClass> getGoodsClassAll(@Param("sex")Integer sex);
 	
 	/**
 	 * 鑾峰彇鏈�澶ф帓搴忓��

--
Gitblit v1.8.0