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

hdw

2018-12-28 c673a0b9ffe1f1239f596dfd88c0a76c735b3d43

 gx_tieta/WebRoot/js/elecircle.content.js

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

         notShow: false,

         content: {

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

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

         }

      },

      {