You can not select more than 25 topics
			Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
		
		
		
		
		
			
	
		
			
				
					
						 
						wxz
					
				
				
					56dfcf89e7
					
				
				
				
				Merge branch 'dev_newversion' into dev_temp
				
					
					# Conflicts:
#	epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
#	epmet-auth/deploy/docker-compose-dev.yml
#	epmet-gateway/deploy/docker-compose-dev.yml
#	epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
#	epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
#	epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
#	epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
#	epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
#	epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
#	epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
#	epmet-user/epmet-user-server/deploy/docker-compose-dev.yml 
				
				
			 | 
			5 years ago | 
		
	
	
		
			
				| .. | 
			
		
		
			
			
			
			
				| 
					
						
							
								
								
								
								
									
										deploy
									
								
							
						
					
				 | 
				
					
						开发启用新的版本号
					
				 | 
				5 years ago | 
			
		
			
			
			
			
				| 
					
						
							
								
								
								
								
									
										src/main
									
								
							
						
					
				 | 
				
					
						环境变量修改
					
				 | 
				5 years ago | 
			
		
			
			
			
			
				| 
					
						
							
								
								Dockerfile
							
						
					
				 | 
				
					
						修改docker配置文件,将app.jar->xxx.jar
					
				 | 
				5 years ago | 
			
		
			
			
			
			
				| 
					
						
							
								
								pom.xml
							
						
					
				 | 
				
					
						Merge branch 'dev' into dev_temp
					
				 | 
				5 years ago |