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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

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

@@ -44,8 +44,8 @@
   }



   @Override

   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state) {

      return userSystemCouponRecordMapper.getRecordByOrderNo(orderNo, state);

   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer source, Integer state) {

      return userSystemCouponRecordMapper.getRecordByOrderNo(orderNo, source, state);

   }



   @Override