Merge branch 'master-2.0-pre-rename' into div

admin

2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849

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