Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java

@@ -46,5 +46,10 @@
   public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list) {

      return userSystemCouponRecordMapper.getRecordByOrderNoList(list);

   }

	
   @Override

   public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds) {

      return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);

   }



}