Merge remote-tracking branch 'origin/div' into div

admin

2019-11-29 32f8ab2806fb088335e24983477f5179064ada9d

 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);

   

}