From f6e2f4ba4093e401475398e1bd3f7c2e8165b3cb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 十二月 2024 10:30:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 6 ++++++
1 files changed, 6 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 e05c57d..45e60a1 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
@@ -139,6 +139,12 @@
@ApiModelProperty(value = "地区价格")
private List<GoodsArea> goodsAreaList;
+ @TableField(exist = false)
+ private String categoryName;
+
+ @TableField(exist = false)
+ private Integer showStatus;
+
public String getIdStr() {
return String.valueOf(id);
}
--
Gitblit v1.7.1