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

admin

2019-10-12 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f

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

@@ -54,11 +54,6 @@
   }



   @Override

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

      return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);

   }



   @Override

   public boolean isSuccessMianDan(Integer source, String orderId) {

      List<String> orderList = new ArrayList<>();

      orderList.add(orderId);