Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-18 a823bffa3800426d0a908b9397a8ea7586b5be21

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/UserCouponService.java

@@ -24,5 +24,5 @@
    * @param userId
    * @return
    */
   List<PaymentUserCouponVo> getUserCoupon(Long userId, BigDecimal orderMoney, Integer type);
   List<PaymentUserCouponVo> getUserCoupon(Long userId, Integer type);
}