Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 36ce1f3549df46609b4e3bc0bf0810bd0c85277e

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