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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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,