From 2670877343c40ae19f536cd9cc19e39ce3153a76 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 27 三月 2023 16:56:32 +0800 Subject: [PATCH] remove 移除 vue2 前端工程 统一使用 vue3 工程 --- 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 dec9c8b..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.generator.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