Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 fd2823afc771def7f9ea1f09d9c38ea8086aa395

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java

@@ -15,6 +15,6 @@
 * @since 2024-11-21
 */
public interface OrderGoodMapper extends BaseMapper<OrderGood> {
    public List<OrderGood> getOrderListByUserIdAndGoodsId(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
    public List<OrderGood> getOrderListByUserIdAndGoodsId(@Param("userId") Long userId,@Param("goodsId") Integer goodsId);

}