From d696ed98415d88f17047644e3f77a1ef50a48d5f Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 10:49:21 +0800
Subject: [PATCH] update test.sql 更新测试 SQL 增加租户id ; update 更新 TestDemo, TestTree 实体继承 ; fix 修正 TestDemoVo 注解标注错误导致的修改异常 ;
---
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