Merge remote-tracking branch 'origin/div' into div

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

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





}