Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-16 cdd5fe1813e63adcddd61581cb886b9d154e5a3c

 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,