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

admin

2020-02-23 b8134c0133956c67cd94fb4efa036238df2cbe2e

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

   }

}