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

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

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