Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

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

}