Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-27 0befca3e70b575c420e7a14fa113aeb74b8fbef8

 ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java

@@ -28,6 +28,10 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private Long goodsId;

    @ApiModelProperty(value = "订单id")
    @TableField("order_id")
    private Integer orderId;