From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/machineroomM.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index ba2a943..2c13fab 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -21,7 +21,7 @@
 			<div data-role="content">
 				<ul class="breadcrumb"></ul>
 				<div class="home-search-input-container">
-					<input type="text" data-type="search" name="search" id="searchInput" placeholder="鎼滅储鍐呭...">
+					<input type="text" data-type="search" name="search" id="searchInput" placeholder="璇疯緭鍏ユ満鎴垮悕绉板叧閿瓧...">
 				</div>
 				<div id="battList"></div>
 			</div>

--
Gitblit v1.9.1