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

admin

2019-09-26 f38e508d334ae03024f0dce0d1fb6baed212dc24

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java

@@ -16,4 +16,20 @@
    * @return

    */

   List<UserGoldCoinVO> listByUserGoldCoin(@Param("start")long start, @Param("count")int count, @Param("type")int type);

	
	
   long countByUserGoldCoin(@Param("type")int type);

	
	
   /**

    * 统计用户累计获得金币，消耗金币

    * @param start

    * @param count

    * @param type

    * @return

    */

   List<UserGoldCoinVO> listByHasGoldCoin(@Param("start")long start, @Param("count")int count);

	
	
   long countByHasGoldCoin();

}