Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java

@@ -51,7 +51,7 @@
    * @param position
    * @return
    */
   int countByPosition(@Param("position") String position);
   int getMaxOrderByPosition(@Param("position") String position);

   /**
    * 查询有效弹出框