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

admin

2020-04-29 5aad3f49f4d00e4c15456a50a0c06e656ac5007d

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

   }

}