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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponGiveRecordService.java

@@ -55,6 +55,14 @@
    * @return

    */

   public UserSystemCouponGiveRecord getByReceiveId(Long receiveId);

	
   /**

    * 查询券赠送信息

    * @param couponId

    * @return

    */

   public UserSystemCouponGiveRecord getByCouponId(Long couponId);





   

   /**