From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
index 9114c9e..6c453ab 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.domain.dto;
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,7 +13,7 @@
*/
@Data
-public class AppBuyGoodsDto extends AppBaseDto{
+public class AppBuyGoodsDto extends AppBaseDto {
@ApiModelProperty(value = "商品id")
@@ -22,6 +23,6 @@
private Integer buyNum;
@ApiModelProperty(value = "用户优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
}
--
Gitblit v1.7.1