wxz
							
						 | 
						
							
							
							
								
							
								0e68703ffa
								
							
								
							
						 | 
						
							
							
								
								1.去掉负载均衡配置(有问题)
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ecc5cedac
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-group/resi-group-server/pom.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								26c0138af8
								
							
								
							
						 | 
						
							
							
								
								url修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7a57d7b018
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f0350bfea9
								
							
								
							
						 | 
						
							
							
								
								修改异常抛出
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								505b70bac4
								
							
								
							
						 | 
						
							
							
								
								1.增加test测试环境compose文件
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								7d78a85d2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
#	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/topic/controller/ResiTopicController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								b294d386b1
								
							
								
							
						 | 
						
							
							
								
								群组相关接口、议题相关接口
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								06f4144e13
								
							
								
							
						 | 
						
							
							
								
								权限注解添加
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8fcba0f981
								
							
								
							
						 | 
						
							
							
								
								1.升级,修复compose配置文件错误
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6dc32fb867
								
							
								
							
						 | 
						
							
							
								
								1.升级,修复compose配置文件错误
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f074596218
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								df9fc4ac93
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								53f71e2d45
								
							
								
							
						 | 
						
							
							
								
								议题详情修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d802350431
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1ab0ff7c56
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e544be46f1
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								175b430da0
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								bca2ea065c
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f97e1fb041
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6bc09369ac
								
							
								
							
						 | 
						
							
							
								
								GovIssueRedis修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								27cfaed075
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								134039c5be
								
							
								
							
						 | 
						
							
							
								
								项目跟踪-转其他部门
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								aef29a3350
								
							
								
							
						 | 
						
							
							
								
								1.升级,创建130dev环境
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a2516099de
								
							
								
							
						 | 
						
							
							
								
								1.升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b8e0c4d38d
								
							
								
							
						 | 
						
							
							
								
								1.配置错误修复
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1d61bb27b5
								
							
								
							
						 | 
						
							
							
								
								1.将dev环境改为130机器
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1cb7b0cb6b
								
							
								
							
						 | 
						
							
							
								
								项目人员关联表添加字段
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e9c2add5ce
								
							
								
							
						 | 
						
							
							
								
								EpmetErrorCode 补漏
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								1cc9df3978
								
							
								
							
						 | 
						
							
							
								
								1.将dev环境改为130机器
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f991a99175
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								debc462e8c
								
							
								
							
						 | 
						
							
							
								
								政府端待办事项(reddot)接口、查询网格列表接口开发及修改,涉及各业务接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a0ccb5d357
								
							
								
							
						 | 
						
							
							
								
								1.修复docker-compose-dev.yml中的image地址错误
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								6ea12c8224
								
							
								
							
						 | 
						
							
							
								
								满意度评价、初始化、列表
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5a1bfd0a55
								
							
								
							
						 | 
						
							
							
								
								1.测试发布到130机器
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bcbcc0d822
								
							
								
							
						 | 
						
							
							
								
								项目结案,退回
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f81cbc4458
								
							
								
							
						 | 
						
							
							
								
								1.测试Dockerfile引用compose.yml环境变量
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								66295e450f
								
							
								
							
						 | 
						
							
							
								
								议题管理、项目跟踪-部门人员选择
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ac30800de3
								
							
								
							
						 | 
						
							
							
								
								1.测试Dockerfile引用compose.yml环境变量
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6b9ec2a3f8
								
							
								
							
						 | 
						
							
							
								
								1.测试release版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								488a9ba8cb
								
							
								
							
						 | 
						
							
							
								
								1.测试release版本升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e7ace76d26
								
							
								
							
						 | 
						
							
							
								
								项目跟踪-项目满意度评价列表
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3b8663a7fc
								
							
								
							
						 | 
						
							
							
								
								议题表决折线图、提交满意度评价、支持、反对议题,满意度评价初始化,表决中详情——支持反对数量
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ac67a34cea
								
							
								
							
						 | 
						
							
							
								
								项目列表和详情
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9778dd748c
								
							
								
							
						 | 
						
							
							
								
								项目跟踪-项目处理进展列表
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								077409f35e
								
							
								
							
						 | 
						
							
							
								
								calender数据库文件
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								68c87a9197
								
							
								
							
						 | 
						
							
							
								
								删除resi-hall,gov-issue,gov-projecctdemo
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f777848ee8
								
							
								
							
						 | 
						
							
							
								
								去除多余引用
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								15e78da1ac
								
							
								
							
						 | 
						
							
							
								
								insertOperLanguageEntity
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ba1a4820fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago |