钮海涛 
							
						 
						
							
							
								7ca3b43bfe 
								
							
								 
							
						 
						
							
							
								
								合并DEV分支代码  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								b04ef3caa4 
								
							
								 
							
						 
						
							
							
								
								合并TEST分支代码  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								ef40f20e1d 
								
							
								 
							
						 
						
							
							
								
								解决合并冲突  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								3c22c8e3f4 
								
							
								 
							
						 
						
							
							
								
								test版本合并到master  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								e140910db7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								50999e49f2 
								
							
								 
							
						 
						
							
							
								
								软适配添加原始报文查询  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								b3999ad481 
								
							
								 
							
						 
						
							
							
								
								dev merge test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								767c1bffbc 
								
							
								 
							
						 
						
							
							
								
								test merge dev  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								81266fbfb6 
								
							
								 
							
						 
						
							
							
								
								解决合并冲突  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								9a516f893f 
								
							
								 
							
						 
						
							
							
								
								合并dev代码到test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								6033695b99 
								
							
								 
							
						 
						
							
							
								
								修复合并版本问题  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								085f15427d 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								dfa993b9e9 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								15f0a37508 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								bcb4e5ad13 
								
							
								 
							
						 
						
							
							
								
								merge test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								31b5f3e234 
								
							
								 
							
						 
						
							
							
								
								merge dev 还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b18408b3bb 
								
							
								 
							
						 
						
							
							
								
								merge test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								800a954b7f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' into dev  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								6d71c01178 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								26b564f0be 
								
							
								 
							
						 
						
							
							
								
								FTP 文件编码类型  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								6c5c726187 
								
							
								 
							
						 
						
							
							
								
								REST 服务端适配器支持JSON与XML  
							
							... 
							
							
							
							FTP 支持增量写入
国际化资源内存缓存 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								fdd5516a0f 
								
							
								 
							
						 
						
							
							
								
								FTP适配器优化  
							
							... 
							
							
							
							表单功能优化
UA 适配 LONG类型 
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								b0b07437d6 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								60c1f6ecab 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								47ae0b46ef 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								0067e31420 
								
							
								 
							
						 
						
							
							
								
								合并test分支代码到dev分支  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								2f8b0ba5db 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								a71d7a31ce 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								e416b032c2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into test  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								4fc8c2a80d 
								
							
								 
							
						 
						
							
							
								
								软适配添加适配发送报文  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								7aaa8bca6d 
								
							
								 
							
						 
						
							
							
								
								合并dev分支代码到test分支  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								adb95f100f 
								
							
								 
							
						 
						
							
							
								
								Ics 日志收集功能完成  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								32a566be93 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' into dev  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								6061f89d43 
								
							
								 
							
						 
						
							
							
								
								修复合并版本问题  
							
							
							
						 
						
							5 years ago  
				
					
						
							
							
								 
						
							
							
								a4ba058ee3 
								
							
								 
							
						 
						
							
							
								
								表单查询条件  
							
							... 
							
							
							
							Rest是适配器 requestBody 
							
						 
						
							5 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								b303cf9a14 
								
							
								 
							
						 
						
							
							
								
								修复合并问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								99d3c9d721 
								
							
								 
							
						 
						
							
							
								
								提测合并 还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ef88c80c0 
								
							
								 
							
						 
						
							
							
								
								提测合并 还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6169542dbb 
								
							
								 
							
						 
						
							
							
								
								合并代码  有代码丢失或者文件丢失请排查此处  
							
							... 
							
							
							
							Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java 
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								786c442d55 
								
							
								 
							
						 
						
							
							
								
								解决冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								c1241bd6c5 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								53a421b3b9 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								94e9b2ffec 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								029763feb1 
								
							
								 
							
						 
						
							
							
								
								pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								30fcf4f23f 
								
							
								 
							
						 
						
							
							
								
								pom冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								717f268c28 
								
							
								 
							
						 
						
							
							
								
								POJO版本号还原  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9532489502 
								
							
								 
							
						 
						
							
							
								
								POJO添加序列化id  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								a6e9b90026 
								
							
								 
							
						 
						
							
							
								
								pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								de9017ca5c 
								
							
								 
							
						 
						
							
							
								
								冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								7d192b36a6 
								
							
								 
							
						 
						
							
							
								
								pom冲突  
							
							
							
						 
						
							6 years ago