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.
		
		
		
		
		
			
	
		
			|  jianjun
					
				
				
					dfeabf616c
					
				
				
				
				Merge remote-tracking branch 'remotes/origin/dev' into dev_group_code # Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/pom.xml
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 years ago | 
	
	
		
			
				| .. | 
		
		
			
			
			
			
				| src/main/java/com/epmet | Merge remote-tracking branch 'remotes/origin/dev' into dev_group_code | 5 years ago | 
		
			
			
			
			
				| pom.xml | 政府端党建声音列表 | 5 years ago |