From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java
index 13b9c6b..dea1032 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java
@@ -56,7 +56,7 @@
 	 * 鏌ヨ鏈夋晥鐨勬偓娴ぇ鍥�
 	 * @return
 	 */
-	public FloatAD getEffectiveFloatAD(String position);
+	public FloatAD getEffectiveFloatAD(String position, Integer type);
 
 
 }

--
Gitblit v1.8.0