From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsDto.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsDto.java
index d8de4b1..8d3545d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsDto.java
@@ -16,10 +16,13 @@
 @Data
 public class MerSureConsumerGoodsDto extends MerBaseDto {
 
-    @ApiModelProperty(name = "会员用户id")
+    @ApiModelProperty(value = "会员用户id")
     private Long memberUserId;
 
-    @ApiModelProperty(name = "确认服务列表")
+    @ApiModelProperty(value = "服务id")
+    private String consumerGoodsId;
+
+    @ApiModelProperty(value = "确认服务列表")
     private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;
 
 }

--
Gitblit v1.7.1