From ed49c6dc279115182e3581983ef09498307742a1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 8 Apr 2020 12:02:26 +0800
Subject: [PATCH] =?UTF-8?q?list*.vm=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm | 5 +++--
 ruoyi-generator/src/main/resources/vm/html/list.html.vm      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
index 71181201..b0e736d9 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
@@ -25,7 +25,7 @@
                                 <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
                             <li>
                                 <label>${comment}：</label>
                                 <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
@@ -33,11 +33,12 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
                             <li>
                                 <label>${comment}：</label>
                                 <select name="${column.javaField}">
                                     <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
                                 </select>
                             </li>
 #elseif($column.htmlType == "datetime")
diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
index 6528a929..692cb38b 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -25,7 +25,7 @@
                                 <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
                             <li>
                                 <label>${comment}：</label>
                                 <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
@@ -33,11 +33,12 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
                             <li>
                                 <label>${comment}：</label>
                                 <select name="${column.javaField}">
                                     <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
                                 </select>
                             </li>
 #elseif($column.htmlType == "datetime")