Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 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