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

yujian

2019-08-26 da36dbefcd945cc85d170c5c2e78682d13497f97

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java

@@ -51,14 +51,14 @@
    * @param position
    * @return
    */
   int countByPosition(@Param("position") String position);
   int getMaxOrderByPosition(@Param("position") String position);

   /**
    * 查询有效弹出框
    * @param position
    * @return
    */
   FloatAD getEffectiveFloatAD(@Param("position") String position);
   FloatAD getEffectiveFloatAD(@Param("position") String position, @Param("type") Integer type);

}