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/entity/ColumnEntity.java |    4 +++-
 1 files changed, 3 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 0fed85b..e13666a 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
@@ -20,11 +20,13 @@
     //栏目编码
     private String columnCode;
     //描述
-    private String describe;
+    private String remark;
     //排序
     private Integer orderNum;
     //图片
     private String pic;
     //上级类目ID
     private Long parentId;
+    //所属ID
+    private Long companyId;
 }

--
Gitblit v1.9.1