From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/index.jsp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 8d57304..a21aa51 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1570,7 +1570,7 @@
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
 		var icon = $('<img src="'+mapImages.powercut+'">');
-		var span = $('<span>鏈烘埧鍋滅數</span>');
+		var span = $('<span>鍋滅數鏈烘埧</span>');
 		iconList.append(input);
 		iconList.append(span);
 		iconList.append(icon);

--
Gitblit v1.9.1