Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-04 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppShoppingCartAddDto.java

@@ -14,11 +14,11 @@
@Data
public class AppShoppingCartAddDto extends AppBaseDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    @ApiModelProperty(value = "商户id")
    private Long shopId;

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

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;