Merge branch 'master' of http://git.9026.com/baimeng/wuliu.git

wl/www/js/config/config.js

@@ -5,5 +5,6 @@
          server: "http://120.25.204.211/"
       //  server: "http://wl.youawan.com/"
        // server: 'http://localhost:8094/'
+       
     });
 })(angular.module('app'));