From 47793b7c905f2bcdf8c2034d82a5415722c89a8f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 九月 2020 18:21:23 +0800
Subject: [PATCH] 升级oshi到最新版本v5.2.5

---
 src/main/java/com/ruoyi/common/constant/GenConstants.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 8e95f37..52485cf 100644
--- a/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -29,7 +29,7 @@
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
     /** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "narchar", "varchar2", "tinytext", "text",
+    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
             "mediumtext", "longtext" };
 
     /** 鏁版嵁搴撴椂闂寸被鍨� */
@@ -74,6 +74,9 @@
     /** 鏃ユ湡鎺т欢 */
     public static final String HTML_DATETIME = "datetime";
 
+    /** 瀵屾枃鏈帶浠� */
+    public static final String HTML_EDITOR = "editor";
+
     /** 瀛楃涓茬被鍨� */
     public static final String TYPE_STRING = "String";
 

--
Gitblit v1.9.3