From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42: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/entity/ColumnEntity.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
index 314d22f..90fa975 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
@@ -1,32 +1,63 @@
 package com.xcong.farmer.cms.modules.system.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.xcong.farmer.cms.common.system.base.BaseEntity;
 import lombok.Data;
+import org.tron.trident.abi.datatypes.Int;
+
+import java.util.List;
 
 /**
  * 栏目表
  */
 @Data
 @TableName("t_column")
-public class ColumnEntity  extends BaseEntity {
+public class ColumnEntity extends BaseEntity {
     /**
      * 导航栏 - 默认上级类目ID
      */
     public static final Long PARENTID_DEFAULT = 0L;
 
-    //栏目名称
+    // 栏目名称
     private String columnName;
-    //栏目编码
+    // 栏目编码
     private String columnCode;
-    //描述
+    // 描述
     private String remark;
-    //排序
+    // 排序
     private Integer orderNum;
-    //图片
+    // 图片
     private String pic;
-    //上级类目ID
+    // 上级类目ID
     private Long parentId;
-    //所属ID
-    private Long belongId;
+    // 所属ID
+    private Long companyId;
+
+    // 列表页模板
+    private String listTemplate;
+
+    // 文章页模板
+    private String articleTemplate;
+
+    // 栏目类型 1-普通栏目 2-标题栏目
+    private Integer type;
+
+    // 目标类型 1-链接到文章 2-链接到栏目 3-外部链接
+    private Integer targetType;
+
+    // 内容类型 1:文章 2:图片 3:文件 4:音频
+    private Integer contentType;
+
+    // 目标地址 (外部地址http/https开头 文章ID/栏目ID)
+    private String targetUrl;
+
+    // 是否为导航 1-是 2-否
+    private Integer isNav;
+
+    // 栏目目录
+    private String path;
+
+    @TableField(exist = false)
+    private List<Long> ids;
 }

--
Gitblit v1.9.1