From 6256203540690d3cf0ebf99f3cb5fa373187c8fc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:04:30 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
index 01fa962..81d861a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
@@ -69,5 +69,13 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "购买数量")
+ private Integer purchaseNum;
+
+
+ @ApiModelProperty(value = "是否成团")
+ private Integer isPurchase;
+
+
}
--
Gitblit v1.7.1