Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-25 a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d

 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);

}