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
					
				
				
					6dc69d00e4
					
				
				
				
				Merge branch 'dev_plugins' into dev_temp
				
					
					# Conflicts:
#	epmet-auth/pom.xml
#	epmet-gateway/pom.xml
#	epmet-module/data-report/data-report-server/pom.xml
#	epmet-module/data-statistical/data-statistical-server/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-job/epmet-job-server/pom.xml
#	epmet-module/epmet-point/epmet-point-server/pom.xml
#	epmet-module/epmet-third/epmet-third-server/pom.xml
#	epmet-module/gov-org/gov-org-server/pom.xml
#	epmet-module/gov-project/gov-project-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-module/resi-mine/resi-mine-server/pom.xml
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml 
				
				
			 | 
			5 years ago | 
		
	
	
		
			
				| .. | 
			
		
		
			
			
			
			
				| 
					
						
							
								
								
								
								
									
										epmet-user-client
									
								
							
						
					
				 | 
				
					
						新增:角色顺序修改,角色名称修改
					
				 | 
				5 years ago | 
			
		
			
			
			
			
				| 
					
						
							
								
								
								
								
									
										epmet-user-server
									
								
							
						
					
				 | 
				
					
						Merge branch 'dev_plugins' into dev_temp
					
				 | 
				5 years ago | 
			
		
			
			
			
			
				| 
					
						
							
								
								pom.xml
							
						
					
				 | 
				
					
						新增epmet-user模块,修改resi-guide数据库连接
					
				 | 
				6 years ago |