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

admin

2020-03-13 3a186e11c331be324f7f470ecf67515ce1d52133

 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);

   }

}