From 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 11:50:14 +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/AdminSeeBarInfoVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
index b6c8fd4..121b746 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
@@ -17,7 +17,7 @@
     private String linkUrl;
     //描述
     @ApiModelProperty(value = "描述")
-    private String describe;
+    private String remark;
     //排序
     @ApiModelProperty(value = "排序")
     private Integer orderNum;

--
Gitblit v1.9.1