Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

zhanglin

2023-07-23 257ce232897d0e4a232e827ba61516b747389078

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

@@ -15,10 +15,10 @@
@Data
public class MerConsumerGoodsVo {

    @ApiModelProperty("未确认商品")
    @ApiModelProperty(value="未确认商品")
    private List<MerConsumerGoodsListVo> noSureList;

    @ApiModelProperty("确认商品")
    @ApiModelProperty(value="确认商品")
    private List<MerConsumerGoodsListVo> sureList;