Merge remote-tracking branch 'origin/master'

admin

2019-06-27 349fe3ad7dc7295729f5ef98aabd7c3c68a90ce6

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

}