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/dao/mybatis/homemodule/FloatADMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
index 4491b5c..a2f53c4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
@@ -58,7 +58,7 @@
* @param position
* @return
*/
- FloatAD getEffectiveFloatAD(@Param("position") String position);
+ FloatAD getEffectiveFloatAD(@Param("position") String position, @Param("type") Integer type);
}
--
Gitblit v1.8.0