Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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

@@ -33,4 +33,12 @@
    */

   public List<UserSystemCouponGiveRecord> overdueList(int count);



	
   /**

    * id查询

    * @param id

    * @return

    */

   public UserSystemCouponGiveRecord selectByPrimaryKey(Long id);



}