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

admin

2020-05-16 554d3857358b0ea53c4f65d8d9baad113ef1deb4

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

@@ -15,10 +15,10 @@
    * @param type

    * @return

    */

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

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

   

   

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

   long countByUserGoldCoin(@Param("type")int type, @Param("key") String key);

   

   

   /**

@@ -28,8 +28,9 @@
    * @param type

    * @return

    */

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

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

   

   

   long countByHasGoldCoin();

   long countByHasGoldCoin(@Param("key") String key);

	
}