tanghc
							
						 | 
						
							
							
							
							
								
							
								e416080de4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								1ff4303d2f
								
							
								
							
						 | 
						
							
							
								
								4.2.4
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								dee635ba6c
								
							
								
							
						 | 
						
							
							
								
								4.2.3
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								72ced304ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								44e321720a
								
							
								
							
						 | 
						
							
							
								
								4.2.3
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								ced55fb3b2
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								950e8a53c3
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e40d885078
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3fce909a35
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								eecbce1e4d
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								019fa9db09
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e92f7c480d
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								78f81ee180
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-admin/sop-admin-server/src/main/resources/public/index.html
#	sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/ServiceConfiguration.java
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								f59223b36e
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								37f61700c1
								
							
								
							
						 | 
						
							
							
								
								4.2.2
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								354d9c70b0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3d68ea80cd
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								ae717f094f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								c0e165f59b
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								376c5179b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								01937163b3
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								4e6de894f0
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								a79272df2d
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								47b7037a12
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								32c3925986
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3d40b9b245
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								f33d69c139
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
							
							
							# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/pom.xml
#	sop-website/sop-website-server/pom.xml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								bdd02abda2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								6bc596efe1
								
							
								
							
						 | 
						
							
							
								
								4.2.1
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								d3bb2a6c29
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop'
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								35161c300a
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								503631fcbe
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								413327df63
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e4b493d58b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								63d9033858
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								4b1fa84f36
								
							
								
							
						 | 
						
							
							
								
								!9 文档业务参数中的“是否必填”值不正确
							
							
							
							
							
							
							
							Merge pull request !9 from Jerry/master 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Jerry
							
						 | 
						
							
							
							
							
								
							
								eeda6b36f2
								
							
								
							
						 | 
						
							
							
								
								fix: 字段 required 属性未获取到值
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3247f4528a
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								b3aa515d01
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								35564e66d8
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e1b287240e
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								1203aaf246
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								3ab4e70be9
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								a9a17731b2
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								794f58c41a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								d5d987c3d2
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								31e23971a1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								13e30c87b6
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								2243a93f5b
								
							
								
							
						 | 
						
							
							
								
								4.2.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								tanghc
							
						 | 
						
							
							
							
							
								
							
								e536726503
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into eureka
							
							
							
							
							
						 | 
						
							5 years ago |