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

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeMapper.java

@@ -15,4 +15,12 @@
   List<IntegralExchange> listValid(@Param("start") long start, @Param("count") int count);
   
   Long countValid();
	
	
   /**
    * 根据类型查询有效兑换
    * @param type
    * @return
    */
   IntegralExchange getValidByType(@Param("type") String type);
}