| 
					
				 | 
			
			
				@ -35,6 +35,11 @@ public class DateUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							int length = strDate.length(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							if(strDate.contains("/")) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
								strDate = strDate.replace("/","-"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							if(strDate.contains("-")) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
								if(length == 10) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -190,10 +195,6 @@ public class DateUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 * 将短时间格式时间转换为字符串 yyyy-MM-dd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 *  
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 * @param dateDate 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 * @param k 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
					public static String dateToStr(java.util.Date dateDate, String format) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						if (dateDate == null) { 
			 |