Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

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

}