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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -83,4 +83,9 @@
   public long countGiveRecord(String type, Integer state) {

      return userSystemCouponGiveRecordMapper.countGiveRecord(type, state);

   }



   @Override

   public UserSystemCouponGiveRecord getByCouponId(Long couponId) {

      return userSystemCouponGiveRecordMapper.getByCouponId(couponId);

   }

}