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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyExtraServiceImpl.java

@@ -15,6 +15,7 @@


   @Resource

   private UserMoneyExtraMapper userMoneyExtraMapper;

	


   @Override

   public UserMoneyExtra selectByPrimaryKey(Long uid) {

@@ -31,5 +32,6 @@
   public List<UserMoneyExtra> listValid(int page, int count) {

      return userMoneyExtraMapper.listValid((page-1) * count, count);

   }



	 
	
}