Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-13 d438c2d73da577b0729176e9a315cde659987b97

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

@@ -27,4 +27,8 @@
    private Integer goodsId;
    @ApiModelProperty("数量")
    private Integer number;
    @ApiModelProperty("购买类型（1=普通商品，2=秒杀商品）")
    private Integer type;
    @ApiModelProperty("状态（0=临时数据，1=购物车数据）")
    private Integer status;
}