From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +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/dto/AdminUpdateColumnDto.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
index 24aab84..d8e1f4d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 @ApiModel(value = "AdminUpdateColumnDto", description = "参数接收类")
 public class AdminUpdateColumnDto {
@@ -11,9 +13,11 @@
     private Long id;
 
     @ApiModelProperty(value = "栏目名称")
+    @NotBlank(message = "请输入栏目名称")
     private String columnName;
 
     @ApiModelProperty(value = "栏目编码")
+    @NotBlank(message = "请输入栏目编码")
     private String columnCode;
 
     @ApiModelProperty(value = "描述")
@@ -28,4 +32,24 @@
     @ApiModelProperty(value = "上级类目ID")
     private Long parentId;
 
+    @ApiModelProperty(value = "列表页模板")
+    private String listTemplate;
+
+    @ApiModelProperty(value = "文章页模板")
+    private String articleTemplate;
+
+    @ApiModelProperty(value = "栏目类型 1-普通栏目 2-标题栏目")
+    private Integer type;
+
+    @ApiModelProperty(value = "若栏目类型为标题类型 1-链接到内容 2-链接到栏目 3-外部地址")
+    private Integer targetType;
+
+    @ApiModelProperty(value = "目标地址")
+    private String targetUrl;
+
+    @ApiModelProperty(value = "是否为导航 1-是 2-否")
+    private Integer isNav;
+
+    @ApiModelProperty(value = "内容类型 1:文章 2:图片 3:文件 4:音频")
+    private Integer contentType;
 }

--
Gitblit v1.9.1