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

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

2019-01-14 920004ebb4f6305d0be692db20a5a15839985394

 gx_tieta/WebRoot/mobil/selectbatt.html

@@ -150,4 +150,4 @@
      });

   </script>

   

</html>
</html>