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

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

diff --git a/gx_tieta/WebRoot/mobil/selectbatt.html b/gx_tieta/WebRoot/mobil/selectbatt.html
index ad3d038..c057d5f 100644
--- a/gx_tieta/WebRoot/mobil/selectbatt.html
+++ b/gx_tieta/WebRoot/mobil/selectbatt.html
@@ -150,4 +150,4 @@
 		});
 	</script>
 	
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1