Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

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





   

   /**