From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang

---
 src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java |    1 -
 1 files changed, 0 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 f8c87d3..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;
 

--
Gitblit v1.9.1