From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/ServeAdvantage.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/ServeAdvantage.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/ServeAdvantage.java
index 521605c..0406865 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/ServeAdvantage.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/ServeAdvantage.java
@@ -31,7 +31,7 @@
     private String title;
 
     @ApiModelProperty("描述")
-    @TableField("describe")
-    private String describe;
+    @TableField("describe_detail")
+    private String describeDetail;
 
 }

--
Gitblit v1.7.1