From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

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

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerConsumerGoodsDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerConsumerGoodsDto.java
index 1ac7aaa..7b2c64a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerConsumerGoodsDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerConsumerGoodsDto.java
@@ -15,9 +15,9 @@
 @Data
 public class MerConsumerGoodsDto extends MerBaseDto {
 
-    @ApiModelProperty(name = "会员用户id")
+    @ApiModelProperty(value = "会员用户id")
     private Long memberUserId;
 
-    @ApiModelProperty("商品类型1周期2服务3体验")
+    @ApiModelProperty(value="商品类型1周期2服务3体验")
     private Integer goodsType;
 }

--
Gitblit v1.7.1