Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-25 59aced4fe04f7e2fdcca81cb9ef279a70522301e

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





   

   /**