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

admin

2019-12-14 63d7d733938c8ea2fbb046625f1f70d6c48f8673

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponGiveRecordMapper.java

@@ -43,6 +43,13 @@
    */
   UserSystemCouponGiveRecord getByReceiveId(@Param("receiveId") Long receiveId);
   
   /**
    * 查询券赠送信息
    * @param count
    * @return
    */
   UserSystemCouponGiveRecord getByCouponId(@Param("couponId") Long couponId);
	
   
   /**
    * 查询赠送记录