From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang
---
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
index fb04b5b..1c98446 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
@@ -19,7 +19,7 @@
private String linkUrl;
//描述
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
//排序
@ApiModelProperty(value = "排序")
private Integer orderNum;
--
Gitblit v1.9.1