Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

8 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

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