From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/control-common.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/control-common.js b/gx_tieta/WebRoot/pages/js/pages/control-common.js
index 067ab6a..531e101 100644
--- a/gx_tieta/WebRoot/pages/js/pages/control-common.js
+++ b/gx_tieta/WebRoot/pages/js/pages/control-common.js
@@ -393,8 +393,8 @@
min = min>0?0:min;
}
- console.info(max);
- console.info(min);
+ //console.info(max);
+ //console.info(min);
var option={
tooltip:{
--
Gitblit v1.9.1