合并代码

puzhibing

2024-03-18 65ca63cc3d36f23d285a7d944fcc0d6bac92430d

 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;