Merge branch 'mater-1.6.0' into div

admin

2019-08-26 dee14e78ad573d7488975a990476e16990bb6376

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

@@ -23,6 +23,11 @@
   }

   

   @Override

   public UserSystemCouponGiveRecord selectByPrimaryKey(Long id) {

      return userSystemCouponGiveRecordMapper.selectByPrimaryKey(id);

   }

	
   @Override

   public UserSystemCouponGiveRecord getRecordByUidAndCouponId(Long giveUid, Long couponId) {

      return userSystemCouponGiveRecordMapper.getRecordByUidAndCouponId(giveUid, couponId);

   }