From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

---
 src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 90fa975..f3c61d4 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
@@ -4,7 +4,6 @@
 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;
 
@@ -60,4 +59,19 @@
 
     @TableField(exist = false)
     private List<Long> ids;
+
+    /**
+     * 更新前栏目ID
+     */
+    private Long beforeParentId;
+
+    /**
+     * 更新前栏目编码
+     */
+    private String beforeColumnCode;
+
+    /**
+     * 发布状态 1-已发布 2-未发布
+     */
+    private Integer releaseState;
 }

--
Gitblit v1.9.1