From 51e4fb4bd7cb6d0e8bb890b35097ccc71f847847 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 26 九月 2025 09:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/common/constant/GenConstants.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index af7991c..e7382b3 100644
--- a/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -13,6 +13,9 @@
/** 鏍戣〃锛堝鍒犳敼鏌ワ級 */
public static final String TPL_TREE = "tree";
+ /** 涓诲瓙琛紙澧炲垹鏀规煡锛� */
+ public static final String TPL_SUB = "sub";
+
/** 鏍戠紪鐮佸瓧娈� */
public static final String TREE_CODE = "treeCode";
@@ -29,15 +32,17 @@
public static final String PARENT_MENU_NAME = "parentMenuName";
/** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
- "mediumtext", "longtext" };
+ public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+ /** 鏁版嵁搴撴枃鏈被鍨� */
+ public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
/** 鏁版嵁搴撴椂闂寸被鍨� */
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
/** 鏁版嵁搴撴暟瀛楃被鍨� */
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
- "bit", "bigint", "float", "float", "double", "decimal" };
+ "bit", "bigint", "float", "double", "decimal" };
/** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈� */
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
@@ -74,6 +79,12 @@
/** 鏃ユ湡鎺т欢 */
public static final String HTML_DATETIME = "datetime";
+ /** 鍥剧墖涓婁紶鎺т欢 */
+ public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+ /** 鏂囦欢涓婁紶鎺т欢 */
+ public static final String HTML_FILE_UPLOAD = "fileUpload";
+
/** 瀵屾枃鏈帶浠� */
public static final String HTML_EDITOR = "editor";
@@ -98,6 +109,9 @@
/** 妯＄硦鏌ヨ */
public static final String QUERY_LIKE = "LIKE";
+ /** 鐩哥瓑鏌ヨ */
+ public static final String QUERY_EQ = "EQ";
+
/** 闇�瑕� */
public static final String REQUIRE = "1";
}
--
Gitblit v1.9.3