Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 e7f23c16b1d1c6553a0442f3d0d129248d267670

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java

@@ -24,7 +24,7 @@
    private final OrderGoodMapper orderGoodMapper;

    @Override
    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId) {
    public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Integer goodsId) {
        return orderGoodMapper.getOrderListByUserIdAndGoodsId(userId, goodsId);
    }
}