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

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

2018-12-29 c363f330655a2e7d5dfe54a767e10d8c86ea96a6

 gx_tieta/WebRoot/js/elecircle.content.js

@@ -1041,7 +1041,7 @@
         status: 0,

         notShow: false,

         content: {

            text: 'sd卡状态：？？？'

            text: 'SD卡状态：？？？'

         }

      },

      {