From 6db1505ab4ec5488855660a6aea4580f7e850dfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 14:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 43fa2a1..120fefe 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,16 +84,16 @@
private Integer underlyingSales;
@ApiModelProperty(value = "商品描述")
- @TableField("describe")
- private String describe;
+ @TableField("describes")
+ private String describes;
@ApiModelProperty(value = "商品介绍")
@TableField("introduce")
private String introduce;
@ApiModelProperty(value = "商品说明")
- @TableField("explain")
- private String explain;
+ @TableField("explains")
+ private String explains;
@ApiModelProperty(value = "状态（1=上架，2=下架）")
@TableField("status")
--
Gitblit v1.7.1