Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-19 626317c580cce67668481e48e10fc4a4fb818678

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

}