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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

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





   

   /**