From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 4dde31e..9730d20 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -412,7 +412,7 @@
 		function searchBattLife(){
 		var temp = createSearchParam();
 		var json = JSON.stringify(temp);
-		var arr = new Array();
+		var arrTd = new Array();
 			$.ajax({
 				type:"post",
 				url:"Batt_enduranceAction!serchByCondition",

--
Gitblit v1.9.1