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

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java

@@ -55,5 +55,6 @@
    @ApiModelProperty(value="服务次数")
    private Integer serviceNum;


    @ApiModelProperty(value = "优惠券id")
    private String couponId;
}