Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

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