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

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

diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 5b98709..a8de8a7 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -29,7 +29,7 @@
 				<a href="voltageM.html" target="_top">1.鍗曚綋鐢靛帇 </a>
 
 			</li>
-			<li>
+			<!--<li>
 				<a href="temperatureM.html" target="_top">2.娓╁害 </a>
 			</li>
 			<li>

--
Gitblit v1.9.1