From fd97cde3d994a3aa6898ba862cd20d0c081012c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 18:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
index e9ea9e4..b559987 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
+import com.ruoyi.system.api.domain.Order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -87,4 +88,7 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isGoodsGroupPurchase;
+ @ApiModelProperty(value = "團購商品訂單")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Order order;
}
--
Gitblit v1.7.1