Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 1693c728681a1ed48a64374b1b7313806681154a

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

@@ -24,7 +24,7 @@
    private Long appUserId;
    @ApiModelProperty("商品id")
    @TableField("goods_id")
    private Long goodsId;
    private Integer goodsId;
    @ApiModelProperty("数量")
    private Integer number;
}