From d2296f646d0eb2dec1f0fa72f02e386e55ccf298 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 15:39:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
index 2e32a95..84e3633 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
@@ -84,8 +84,8 @@
private Integer underlyingSales;
@ApiModelProperty(value = "商品描述")
- @TableField("describe")
- private String describe;
+ @TableField("describes")
+ private String describes;
@ApiModelProperty(value = "商品介绍")
@TableField("introduce")
@@ -103,5 +103,8 @@
@ApiModelProperty(value = "销量")
@TableField(exist = false)
private Integer salesCount;
+ @ApiModelProperty(value = "1商品2优惠卷")
+ @TableField(exist = false)
+ private Integer goodType;
}
--
Gitblit v1.7.1