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

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

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html

@@ -493,7 +493,7 @@
            type: "post",             

              url: "Battinf_applyAction!updatePro",            

              async:true,            

              dataType:'text',

              dataType:'json',

              data:"json="+JSON.stringify(parm),   

              success: function(data){                                

               data = eval('('+data+')');