From 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 14:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java
index a60314a..4df2926 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java
@@ -32,7 +32,7 @@
     private String title;
 
     @ApiModelProperty("描述")
-    @TableField("describe")
-    private String describe;
+    @TableField("describe_detail")
+    private String describeDetail;
 
 }

--
Gitblit v1.7.1