From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
index 4e6f8d7..d9b5f37 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -122,5 +123,21 @@
@TableField(exist = false)
private Integer vipId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "指定门店")
+ private List<GoodsShop> goodsShopList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "指定用户")
+ private List<GoodsAppUser> goodsAppUserList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "会员价格")
+ private List<GoodsVip> goodsVipList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "地区价格")
+ private List<GoodsArea> goodsAreaList;
+
}
--
Gitblit v1.7.1