From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 14 +++++++-------
1 files changed, 7 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 5d5c6a4..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;
@@ -204,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() {
@@ -212,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() {
@@ -220,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) {
@@ -229,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