From 52d0d62c35d01ee73d9dba7b1be99a29adc35ef2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:45:01 +0800
Subject: [PATCH] update 同步 ruoyi 适配改动
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 03e9344..5d3217c 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,6 +1,6 @@
package com.ruoyi.generator.domain;
-import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.constant.GenConstants;
@@ -135,6 +135,7 @@
/**
* 鍒涘缓鑰�
*/
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/**
@@ -147,6 +148,7 @@
/**
* 鏇存柊鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
@@ -202,7 +204,7 @@
}
public static boolean isSub(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
}
public boolean isTree() {
@@ -210,7 +212,7 @@
}
public static boolean isTree(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
}
public boolean isCrud() {
@@ -218,7 +220,7 @@
}
public static boolean isCrud(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
}
public boolean isSuperColumn(String javaField) {
@@ -227,9 +229,9 @@
public static boolean isSuperColumn(String tplCategory, String javaField) {
if (isTree(tplCategory)) {
- return StrUtil.equalsAnyIgnoreCase(javaField,
+ return StringUtils.equalsAnyIgnoreCase(javaField,
ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
- return StrUtil.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+ return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3