Merge remote-tracking branch 'origin/div' into div

admin

2019-10-12 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f

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

}