From f67c97e095e2a812fab6645238aa2b1b6096ad02 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 09 十月 2020 11:37:18 +0800
Subject: [PATCH] !102 rouyi.js中添加日期范围方法dateRange获取bug修复 Merge pull request !102 from zora/master
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index bee9ae1..69cf496 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -59,7 +59,7 @@
/** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
private String queryType;
- /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件） */
+ /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、editor富文本控件） */
private String htmlType;
/** 字典类型 */
@@ -340,7 +340,7 @@
public static boolean isUsableColumn(String javaField)
{
// isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
- return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum");
+ return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
public String readConverterExp()
--
Gitblit v1.9.2