From 43bfbf87d77d4ecd06f90d6286b6e62c52b46299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=BF=E5=98=89=E7=A5=BA?= <gengjiaqi9698@163.com>
Date: Fri, 15 Apr 2022 16:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=E4=BF=9D=E7=95=99=E6=9B=B4=E5=A4=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=201.=20=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=9A=E7=94=A8=E5=B8=B8=E9=87=8F=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?datetime2=EF=BC=88SQL=20Server=EF=BC=89=202.=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A6=82=E6=9E=9C=E5=9C=A8=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=B1=BB=E5=9E=8B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/constant/GenConstants.java  | 2 +-
 .../java/com/ruoyi/generator/service/GenTableServiceImpl.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index e7382b3f1..c8c9652ec 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -38,7 +38,7 @@ public class GenConstants
     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_TIME = { "datetime", "datetime2", "time", "date", "timestamp" };
 
     /** 数据库数字类型 */
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 71f2f8a5e..a0f269779 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -304,9 +304,10 @@ public class GenTableServiceImpl implements IGenTableService
                 column.setColumnId(prevColumn.getColumnId());
                 if (column.isList())
                 {
-                    // 如果是列表，继续保留查询方式/字典类型选项
+                    // 如果是列表，继续保留字典类型、查询方式、显示类型选项
                     column.setDictType(prevColumn.getDictType());
                     column.setQueryType(prevColumn.getQueryType());
+                    column.setHtmlType(prevColumn.getHtmlType());
                 }
                 if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
                         && (column.isInsert() || column.isEdit())