From 79904247e44db414809061d6de6fd0c4e01d38a0 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 18 Mar 2020 23:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css | 2 +-
 .../src/main/resources/vm/html/list-tree.html.vm          | 8 ++++----
 ruoyi-generator/src/main/resources/vm/html/list.html.vm   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index 880b9b70..8896a3ab 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -644,7 +644,7 @@ label {
 	margin: 5px 15px 5px 0px;
 }
 
-.select-list li p{
+.select-list li p, .select-list li label{
 	float: left;
 	width: 65px;
 	margin: 5px 5px 5px 0px;
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 2e05fe61..764b868f 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
@@ -22,12 +22,12 @@
 #end  
 #if($column.htmlType == "input")
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
 #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -35,14 +35,14 @@
                             </li>
 #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <select name="${column.javaField}">
                                     <option value="">所有</option>
                                 </select>
                             </li>
 #elseif($column.htmlType == "datetime")
                             <li class="select-time">
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
                                 <span>-</span>
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
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 10085b75..2d251424 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -22,12 +22,12 @@
 #end  
 #if($column.htmlType == "input")
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
 #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -35,14 +35,14 @@
                             </li>
 #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
                             <li>
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <select name="${column.javaField}">
                                     <option value="">所有</option>
                                 </select>
                             </li>
 #elseif($column.htmlType == "datetime")
                             <li class="select-time">
-                                <p>${comment}：</p>
+                                <label>${comment}：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
                                 <span>-</span>
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>