wangchao
							
						 | 
						
							
							
							
								
							
								d31048b14e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								37747315e1
								
							
								
							
						 | 
						
							
							
								
								修改dto属性名称
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b2419e63b5
								
							
								
							
						 | 
						
							
							
								
								政府段我的消息
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f931306bdd
								
							
								
							
						 | 
						
							
							
								
								议题管理、项目跟踪-业务调整带来的部分代码变动(漏提文件)
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d59c150bb0
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								92badec65b
								
							
								
							
						 | 
						
							
							
								
								1.日志切面增加执行时长计算
							
							
							
							
							
							
								
							
							
							2.将权限的判断以及SQL过滤片段的生成放到了gov-access,从业务模块剥离出来 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								70ddb7e1af
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								214ee92025
								
							
								
							
						 | 
						
							
							
								
								议题管理、项目跟踪-业务调整带来的部分代码变动
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e8c7c8fa96
								
							
								
							
						 | 
						
							
							
								
								议题详情修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								1f0358dc14
								
							
								
							
						 | 
						
							
							
								
								项目问题修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3a4be6974b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								3c47d99d14
								
							
								
							
						 | 
						
							
							
								
								群组缓存bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4d1f267cdc
								
							
								
							
						 | 
						
							
							
								
								项目问题修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f5a4425e8b
								
							
								
							
						 | 
						
							
							
								
								reddot接口修改发布
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6d39548aa1
								
							
								
							
						 | 
						
							
							
								
								reddot接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								df2b22cf5a
								
							
								
							
						 | 
						
							
							
								
								服务升级
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								60d4b76bf4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/pom.xml 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								dfdc7ea8de
								
							
								
							
						 | 
						
							
							
								
								修改群组服务的execution表达式
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								470fabcfc4
								
							
								
							
						 | 
						
							
							
								
								controller添加传参判断,议题处理进展添加权限注解
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ed4a902f71
								
							
								
							
						 | 
						
							
							
								
								本机url
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								80b6d2422d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a8d2f58e5d
								
							
								
							
						 | 
						
							
							
								
								reddot接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								71f81bf847
								
							
								
							
						 | 
						
							
							
								
								项目列表修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7fef4da39f
								
							
								
							
						 | 
						
							
							
								
								议题处理进展、表决中支持、反对数量修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								e710bc978f
								
							
								
							
						 | 
						
							
							
								
								issue表建表语句时间类型由date改成datetime
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								aef0287d6d
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								712c8d2266
								
							
								
							
						 | 
						
							
							
								
								待办红点提醒
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								471cc04144
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								245f451676
								
							
								
							
						 | 
						
							
							
								
								议题管理-议题转项目
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a5a377c43
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0ccd5515fc
								
							
								
							
						 | 
						
							
							
								
								getMyGrids接口修改,resigroup 缓存库db1
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0c808ae5aa
								
							
								
							
						 | 
						
							
							
								
								getMyGrids接口修改,resigroup 缓存库db1,gateway修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								a9348c2d75
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/pom.xml
#	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/controller/IssueManageController.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.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-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
#	epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
#	epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
#	epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
#	epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								9ed7b7c02b
								
							
								
							
						 | 
						
							
							
								
								群成员缓存加上手机号字段、议题相关接口(居民端、政府端)
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7b031417bf
								
							
								
							
						 | 
						
							
							
								
								升级服务发布dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9ee87936e7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d226cbbc14
								
							
								
							
						 | 
						
							
							
								
								居民端获取首页配置(/resi/guide/stranger/getgridhome),政府端(gov/mine/agency/getlatestgrid)接口bug修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								958904fa99
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f62794630e
								
							
								
							
						 | 
						
							
							
								
								1.新增日志切面,打印日志,拦截异常
							
							
							
							
							
							
								
							
							
							2.停用RenExceptionHandler 
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2f628bbd8b
								
							
								
							
						 | 
						
							
							
								
								升级服务发布dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7b88d847f2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								67027f3354
								
							
								
							
						 | 
						
							
							
								
								getlatestgridinfo接口修改
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								987f248d13
								
							
								
							
						 | 
						
							
							
								
								1.compose配置文件错误
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4e050ac8d1
								
							
								
							
						 | 
						
							
							
								
								1.分支切换到release
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fea99e9668
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								17b26d0786
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b42a90264
								
							
								
							
						 | 
						
							
							
								
								议题管理、项目跟踪-人员选择
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d470277f96
								
							
								
							
						 | 
						
							
							
								
								项目表添加客户ID
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9c3790e16a
								
							
								
							
						 | 
						
							
							
								
								升级服务发布dev
							
							
							
							
								
							
							
						 | 
						6 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								17de9a66a5
								
							
								
							
						 | 
						
							
							
								
								项目相关接口
							
							
							
							
								
							
							
						 | 
						6 years ago |