Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-04 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;