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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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

@@ -129,6 +129,6 @@
    * @param source

    * @return

    */

   List<UserSystemCoupon> getNeedActivateFreeCouponByType(@Param("uid") Long uid, @Param("type") String type);

   UserSystemCoupon getNeedActivateCouponByType(@Param("uid") Long uid, @Param("type") String type);

   

}