From 538e7dcc29ef960c1d67014b546f54adc7a5397f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 23 Sep 2019 17:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=96=87=E6=9C=AC=E5=AE=BD=E5=BA=A6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA65px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/css/ry-ui.css    |  4 ++--
 .../resources/templates/demo/table/search.html   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 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 6338c7635..f464ec17c 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
@@ -640,8 +640,8 @@ label {
 
 .select-list li p{
 	float: left;
-	width: 80px;
-	margin: 5px 15px 5px 0px;
+	width: 65px;
+	margin: 5px 5px 5px 0px;
 	text-align:right;
 }
 
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/search.html b/ruoyi-admin/src/main/resources/templates/demo/table/search.html
index 210b58b0b..efd573de9 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/search.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/search.html
@@ -97,19 +97,19 @@
 					<div class="select-list">
 						<ul>
 							<li>
-								<p>商户编号：</p>
+								<p style="width: 80px">商户编号：</p>
 								<input type="text" name="userId"/>
 							</li>
 							<li>
-								<p>订单号：</p>
+								<p style="width: 80px">订单号：</p>
 								<input type="text" name="orderNo"/>
 							</li>
 							<li>
-								<p>日期：</p>
+								<p style="width: 80px">日期：</p>
 								<input type="text" class="time-input" placeholder="日期"/>
 							</li>
 							<li class="select-selectpicker">
-								<p>状态：</p>
+								<p style="width: 80px">状态：</p>
 								<select class="selectpicker" data-none-selected-text="请选择" multiple>
 									<option value="">所有</option>
 									<option value="0">初始</option>
@@ -119,7 +119,7 @@
 								</select>
 							</li>
 							<li>
-								<p>供货商通道：</p>
+								<p style="width: 80px">供货商通道：</p>
 								<select>
 									<option value="">所有</option>
 									<option value="0">腾讯</option>
@@ -128,7 +128,7 @@
 								</select>
 							</li>
 							<li>
-								<p>来源：</p>
+								<p style="width: 80px">来源：</p>
 								<select>
 									<option value="">所有</option>
 									<option value="0">手机</option>
@@ -137,7 +137,7 @@
 								</select>
 							</li>
 							<li>
-								<p>运营商：</p>
+								<p style="width: 80px">运营商：</p>
 								<select>
 									<option value="">所有</option>
 									<option value="0">移动</option>
@@ -146,7 +146,7 @@
 								</select>
 							</li>
 							<li class="select-time">
-								<p>回调时间：</p>
+								<p style="width: 80px">回调时间：</p>
 								<input type="text" class="time-input" placeholder="开始时间"/>
 								<span>-</span>
 								<input type="text" class="time-input" placeholder="结束时间"/>