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

无关风月

2025-08-27 b8abd1c4081c2c67c1f258b9956f4c60652d831d

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderGoodsVO.java

@@ -15,8 +15,6 @@
    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "类型（1=服务商品，2=单品商品）")
    private Integer type;

    @ApiModelProperty(value = "数量")
    private Integer num;