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/elegroup.jsp

@@ -307,7 +307,7 @@
         }

      });

      

      setUserName();

      //setUserName();

      //页面加载完生成包机组列表

      searchAllbaojiGroup();