Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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

@@ -25,7 +25,7 @@
    * @param seconds

    * @return

    */

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

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



   /**

    * 查询状态