Merge remote-tracking branch 'origin/master'

yujian

2019-06-20 bf5d1b405c759de3faa42af37b1f10f42823b105

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

}