|  | @@ -239,11 +239,8 @@ module.exports = (function () {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }));
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -<<<<<<< HEAD
 | 
	
		
			
				|  |  | -   //let staticHost = 'http://afts.hnzhiming.com';
 | 
	
		
			
				|  |  | -=======
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      //let staticHost = 'http://afts.hnzhiming.com';
 | 
	
		
			
				|  |  | ->>>>>>> 616af63cf649d6ce785c0bbfe358e9163f4c82e2
 | 
	
		
			
				|  |  |      let staticHost = 'http://127.0.0.1';    
 | 
	
		
			
				|  |  |      switch (argv.env.deploy) {
 | 
	
		
			
				|  |  |          case 'test':
 |