Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java

@@ -69,9 +69,9 @@
    * @param count

    * @return

    */

   public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type);

   public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type, String key);



   public long countByUserGoldCoin(int type);

   public long countByUserGoldCoin(int type, String key);



   /**

    * 统计剩余金币

@@ -79,8 +79,8 @@
    * @param count

    * @return

    */

   public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count);

   public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count, String key);



   public long countByHasGoldCoin();

   public long countByHasGoldCoin(String key);

   

}