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

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

2019-01-16 a2cb03002bc7b9ed76e9586947fec73ebc223215

 gx_tieta/WebRoot/charge-test.jsp

@@ -4172,7 +4172,7 @@
    function getBattStr() {

       var battInfo = getBattinfById();

       //console.info(battInfo);

       var battStr = battInfo.StationName+'-'+battInfo.BattGroupName;

       var battStr = battInfo.StationName+'-'+battInfo.BattGroupName+'-标称容量'+battInfo.MonCapStd+'AH';

       $('#address_infor').text(battStr);

    }