Merge remote-tracking branch 'origin/master'

admin

2019-05-14 1a8fd056235eaf09c7eb5ecc68fd95b585e079be

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java

@@ -37,6 +37,14 @@
   List<UserSystemCoupon> getUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
   
   /**
    * 根据来源查询订单
    * @param uid
    * @param source
    * @return
    */
   int countTodatyUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
	
   /**
    * 获取已经过期但状态未改变的券
    * @param uid
    * @return