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/dto/MerSureConsumerGoodsDto.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(value = "服务id")
    private String consumerGoodsId;

    @ApiModelProperty(value = "确认服务列表")
    private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;