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

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

2019-01-08 f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4

 gx_tieta/WebRoot/pages/js/pages/siderbar.js

@@ -220,7 +220,7 @@
   var city = getQueryString('city');          // 市

   var county = getQueryString('county');      // 区/县

   var home = getQueryString('home');         // 机房

   var homeid = getQueryString('homeid');      // 电池组id

   var homeid = getQueryString('battid');      // 电池组id

   //console.log(province);

   

   // 生成一级导航-省