From 5cf45e866329428864bc1c3ec1a0f67ba282fc8a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 18:20:55 +0800
Subject: [PATCH] update springboot 3.0.2 => 3.0.4 update easyexcel 3.2.0 => 3.2.1 update hutool 5.8.11 => 5.8.14 update redisson 3.19.2 => 3.20.0 update lombok 1.18.24 => 1.18.26 update maven-compiler-plugin 3.10.1 => 3.11.0 update maven-surefire-plugin 3.0.0-M7 => 3.0.0-M9
---
ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 8db42a6..ed1ea1a 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,14 +1,16 @@
package com.ruoyi.generator.domain;
-import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.core.constant.GenConstants;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.generator.constant.GenConstants;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.ArrayUtils;
import java.util.List;
@@ -183,10 +185,6 @@
}
public static boolean isSuperColumn(String tplCategory, String javaField) {
- if (isTree(tplCategory)) {
- return StringUtils.equalsAnyIgnoreCase(javaField,
- ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
- }
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
}
--
Gitblit v1.9.3