Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/FloatADService.java

@@ -56,7 +56,7 @@
    * 查询有效的悬浮大图

    * @return

    */

   public FloatAD getEffectiveFloatAD(String position);

   public FloatAD getEffectiveFloatAD(String position, Integer type);





}