Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-08 f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4

 gx_tieta/WebRoot/bat-set-test.jsp

@@ -742,6 +742,7 @@
                       if(_data.num==1) {

                          var obj = _data.obj[0];

                          _tmp = contrastData(layuiData.data, _data.obj[0]);

                          _tmp.readStatus = 1;   // 读取状态

                          _tmp.setStatus = 0;      // 设置参数状态初始化

                       }else {

                          _tmp.num = 0;