Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 1dd3558d3ea498644f51a145b853e56601dec60e

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

}