From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java
index 6373209..c2b144d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java
@@ -12,7 +12,7 @@
 	 * 鏌ヨ瀵艰埅鏍�
 	 * @return
 	 */
-	public List<HomeNavbar> listEffectiveNavbar(Long uid, String device);
+	public List<HomeNavbar> listEffectiveNavbar(Long uid, String device, Integer sex);
 
 	/**
 	 * 淇濆瓨鐢ㄦ埛鑷畾涔�

--
Gitblit v1.8.0