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

hdw

2018-11-03 4fa214f38cb5a19599655636a8ea4e25eaf496a3

 gx_tieta/WebRoot/js/elecircle.content.js

@@ -945,7 +945,6 @@
           if(typeof callback == 'function') {

              callback.call({}, data);

           }

        	
           // 判断workstatus

           switch(workstatus) {

              case 0:   {   // 浮充状态