wxz
							
						 | 
						
							
							
							
								
							
								b7c337afe9
								
							
								
							
						 | 
						
							
							
								
								健康检查:改进
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								23d69798d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4c7e2cdd5c
								
							
								
							
						 | 
						
							
							
								
								报事办结+3个回复需要更新事件的最后一次操作时间
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								da4dc9a717
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ba86998a67
								
							
								
							
						 | 
						
							
							
								
								组织的治理指数按天统计--GRID_SELF_GOVERN_PROJECT_TOTAL未赋值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b69c989b8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								28043e3b05
								
							
								
							
						 | 
						
							
							
								
								最新直报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4c1e79cd22
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								886e520b49
								
							
								
							
						 | 
						
							
							
								
								回复列表,时间到分钟
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a93f57bce6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ddcc808863
								
							
								
							
						 | 
						
							
							
								
								先提一半
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								64d8aafc68
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09cf227a59
								
							
								
							
						 | 
						
							
							
								
								工作端,群众直报入口,权限key,记得发一下gov-access
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								731fca8630
								
							
								
							
						 | 
						
							
							
								
								工作端,群众直报入口,权限key,记得发一下gov-access
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1c0b17eb10
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								23c30ae2a8
								
							
								
							
						 | 
						
							
							
								
								修哎是否 显示已解决 未解决
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								45240781d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								56d8f9b8f1
								
							
								
							
						 | 
						
							
							
								
								报事详情
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b931761d8c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								762c2eff50
								
							
								
							
						 | 
						
							
							
								
								先提project
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								31be58ccf4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_statistical_optimize' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5f6dbccc38
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								10ebd62b2c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b0fb7234ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9b9daf9b01
								
							
								
							
						 | 
						
							
							
								
								updateviewtime校验
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ddc632c4eb
								
							
								
							
						 | 
						
							
							
								
								项目统计相关修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3f45136fcd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b6bc64ff30
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e32581e639
								
							
								
							
						 | 
						
							
							
								
								报事人回复:@的人和组织显示红点;@人回复:被@的其他人+报事人+报给的组织显示红点;组织回复:报事人+@的人+其他组织显示红点。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e49fcf5722
								
							
								
							
						 | 
						
							
							
								
								先提一部分
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9369f2f828
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f36e2d7846
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								de8f78f0d2
								
							
								
							
						 | 
						
							
							
								
								报事-首次查看事件-两端通用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e45cf4204f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4337d11bb7
								
							
								
							
						 | 
						
							
							
								
								org
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4f87fcf4cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								074fdaca21
								
							
								
							
						 | 
						
							
							
								
								@的人回复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fadc539ed8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								83b4c55555
								
							
								
							
						 | 
						
							
							
								
								报事当事人回复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b73e9eb00c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								ee4377c75e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								56f9e23c7a
								
							
								
							
						 | 
						
							
							
								
								修改:查询人大代表接口-将查询条件中的gridId改为customerId,并且返回值中增加userShowName字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								634d05f5b6
								
							
								
							
						 | 
						
							
							
								
								忘了回复内容要走审核
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a7df08871c
								
							
								
							
						 | 
						
							
							
								
								工作人员回复
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f2503d863b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ebd66fc552
								
							
								
							
						 | 
						
							
							
								
								@的人存储姓名。报事入参增加userShowName
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b19f0179c5
								
							
								
							
						 | 
						
							
							
								
								事件详情回复列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								10d1c1cd5b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_resi_event' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								324e1b9945
								
							
								
							
						 | 
						
							
							
								
								我的报事列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f85520f13f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'wxz_bug_pagehelper' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago |