Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 921f30c2112b68307d8b57b089dd582273df7ddb

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

@@ -45,4 +45,7 @@

    @ApiModelProperty(value="消耗次数")
    private Integer usedNum;

    @ApiModelProperty(value="待确认次数")
    private Integer sureNum;
}