Merge branch 'master' into div

yujian

2019-07-11 87f47a04f99266027418b3c1c16055d0a0f83c74

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





}