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/control.jsp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 0c85e8a..41c33a3 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3735,6 +3735,9 @@
// 璁剧疆閫氫俊璁℃暟
status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
+ // 璁剧疆璁惧鐗堟湰鍙�
+ status.setText('devVersion', '璁惧鐗堟湰鍙凤細'+data.dev_version);
+
// 璁剧疆涓㈠寘鐜�
var errorCount = data.dev_errcommcount;
var allCount = data.dev_commcount+errorCount;
--
Gitblit v1.9.1