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/mobil/batt-edit.html

@@ -488,7 +488,7 @@
         console.info(parm);   

         $.ajax({

            type: "post",             

              url: "BattInfAction!update",				
              url: "Battinf_applyAction!addPro",				
              async:true,            

              dataType:'text',

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