From b36874538051c56d9c76485d4485f7b3c164aad3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 06 一月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index ded1587..06c6821 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -112,10 +112,15 @@
         {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
-        // 鏂囦欢瀛楁璁剧疆涓婁紶鎺т欢
+        // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
         else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
         {
-            column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE);
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
         }
         // 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
         else if (StringUtils.endsWithIgnoreCase(columnName, "content"))

--
Gitblit v1.9.3