From a41e23347029bf69a3f59438749658252de81d2e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 15 十月 2024 09:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java |    4 ++--
 1 files changed, 2 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 84e3633..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
@@ -92,8 +92,8 @@
     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