Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -289,4 +289,12 @@
         String startTime, String endTime) throws Exception{

      return hongBaoV2CountMapper.count24HOderByChannel(channel, type, years, startTime, endTime);

   }

	
	
   @Override

   public List<HongBaoV2VO> listShareAndInviteMoney(long start, int count, String date) {

      return hongBaoV2CountMapper.listShareAndInviteMoney(start, count, date);

   }

	
	
}