Merge remote-tracking branch 'origin/master'

admin

2019-02-26 4fe5f879c1b2919099a6e193ab4db8d25725ca40

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

@@ -27,4 +27,14 @@
   List<UserSystemCouponVO> getEnableListByCouponId(@Param("uid") Long uid, @Param("activated") Integer activated,
         @Param("list") List<Long> listCouponId);

   /**
    * 根据来源查询订单
    * @param uid
    * @param source
    * @return
    */
   List<UserSystemCoupon> getUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
	
	
	
}