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

yujian

2019-09-25 3c1f04d76fdd1f60bd78696f8a1aac6dafbbb543

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

@@ -54,6 +54,19 @@
    * @param count

    * @return

    */

   UserSystemCouponGiveRecord getByReceiveId(Long receiveId);

   public UserSystemCouponGiveRecord getByReceiveId(Long receiveId);



	
   /**

    * 查询赠送记录

    * @param start

    * @param count

    * @param type

    * @param state

    * @return

    */

   public List<UserSystemCouponGiveRecord> listGiveRecord(long start, int count, String type, Integer state);



   public long countGiveRecord(String type, Integer state);



}