From 7ed2efc56e0bd3965388f97f9a2db350f6e4e382 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 11:46:35 +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/AdminColumnVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
index 781ca0a..7473c95 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
@@ -18,7 +18,7 @@
private String columnCode;
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "排序")
private Integer orderNum;
@@ -26,6 +26,9 @@
@ApiModelProperty(value = "图片")
private String pic;
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
+ private Integer contentType;
+
@ApiModelProperty(value = "子菜单")
private List<AdminColumnVo> child;
}
--
Gitblit v1.9.1