Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

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





}