From 77870599e51385355f110aeffc9e6d1c42f1cea0 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 11:41:05 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index 1346e26..a1ace7f 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -137,6 +137,7 @@
     				'record_time': date.format('yyyy-MM-dd hh:mm:ss'),	// 鎻愪氦鏃ユ湡
     				'error_descript': '',
     				'stationId': '',
+    				'error_dispose': '',
     				'picture_num':4
     			},
     			files: {}

--
Gitblit v1.9.1