From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 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