From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
index 27755d9..c54294d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java
@@ -24,31 +24,34 @@
 
     @ApiModelProperty(value="商品类型1周期2服务3体验4单品")
     private Integer goodsType;
-
-    @ApiModelProperty(value="商品名称")
+    
+    @ApiModelProperty(value = "商品名称")
     private String goodsName;
-
-    @ApiModelProperty(value="商品标签")
+    
+    @ApiModelProperty(value = "商品标签")
     private String goodsTags;
-
+    
     @ApiModelProperty(value = "商品简介")
     private String goodsIntroduction;
-
-    @ApiModelProperty(value="商品图片")
+    
+    @ApiModelProperty(value = "商品图片")
     private String goodsPicture;
-
-    @ApiModelProperty(value="商品调理问题")
+    
+    @ApiModelProperty(value = "商品调理问题")
     private String goodsNurses;
-
-    @ApiModelProperty(value="周期标记")
+    
+    @ApiModelProperty(value = "周期标记")
     private Integer cycleNumFlag;
-
-    @ApiModelProperty(value="服务次数")
+    
+    @ApiModelProperty(value = "服务次数")
     private Integer serviceNum;
-
-    @ApiModelProperty(value="消耗次数")
+    
+    @ApiModelProperty(value = "消耗次数")
     private Integer usedNum;
-
-    @ApiModelProperty(value="待确认次数")
+    
+    @ApiModelProperty(value = "待确认次数")
     private Integer sureNum;
+    
+    @ApiModelProperty(value = "是否选中")
+    private Boolean optionFlag;
 }

--
Gitblit v1.7.1