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/testdata.html

@@ -25,9 +25,11 @@
           <script type="text/javascript">

              var batt;

              var temp=getCookie("batt");

		  		
              $(document).on('pagecreate', function() {

                 if(temp!=null){

                   batt=eval("("+temp+")");

                   console.info(batt);

                   $('#battName').text(batt.BattGroupName);

                }

              });