Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 425501a2e9202068f980a63a1d20fdd637bb152c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java

@@ -15,6 +15,6 @@
 */
public interface OrderGoodService extends IService<OrderGood> {

    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId);
    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId);

}