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

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

2019-01-16 a2cb03002bc7b9ed76e9586947fec73ebc223215

 gx_tieta/WebRoot/js/elecircle.content.js

@@ -1045,6 +1045,15 @@
         }

      },

      {

         name:'devVersion',

         type: 'text',

         status: 0,

         notShow: false,

         content: {

            text: '设备版本号：？？？'

         }

      },

      {

         name: 'signal',

         type: 'text',

         status: 0,