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

yujian

2020-05-13 585b487cc71d06b2f76883f6f3b7247d1378874e

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java

@@ -18,14 +18,6 @@


   public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list);



   /**

    * 查询正在使用中 超过时间仍未匹配到订单记录

    * 
    * @param uid

    * @param seconds

    * @return

    */

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



   /**

    * 查询状态