yinzuomei
							
						 | 
						
							
							
							
								
							
								4fc3520a32
								
							
								
							
						 | 
						
							
							
								
								报事-首次查看事件-两端通用接口调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9686888aef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dc1b0002ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								bb2b5bcf2d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d71a4387cc
								
							
								
							
						 | 
						
							
							
								
								发文数量取值错误 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f2661fee75
								
							
								
							
						 | 
						
							
							
								
								【网格员工作统计】项目列表导出
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0889f68bc5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8e2fc9120f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1962a09695
								
							
								
							
						 | 
						
							
							
								
								居民端活动详情actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								508c903a4c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								12219e439d
								
							
								
							
						 | 
						
							
							
								
								秒变小时分钟
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								67468af4c2
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								deb99cfd2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								0b7d2cc4ae
								
							
								
							
						 | 
						
							
							
								
								发文数量取值错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6b81fbe28e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								fd7e7237f2
								
							
								
							
						 | 
						
							
							
								
								【网格员工作统计】项目列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8e36fd2841
								
							
								
							
						 | 
						
							
							
								
								网格员巡查记录导出
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bbd726664c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								87cf8a4de7
								
							
								
							
						 | 
						
							
							
								
								放开报事人用户id
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								0de1b12d45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d2d7421268
								
							
								
							
						 | 
						
							
							
								
								【网格员工作统计】项目列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								175d775b37
								
							
								
							
						 | 
						
							
							
								
								导出
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a039ea9d98
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ecba660e2a
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.网格员巡查,修改sql错误,更改时间入参格式 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2f432d217d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into release_temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								75f6a03026
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								78ae50b3a1
								
							
								
							
						 | 
						
							
							
								
								工作端活动管理列表返回actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								291bf2e99e
								
							
								
							
						 | 
						
							
							
								
								中间库会消费 平阴和下面3个街道的数据 所以去掉 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a19615b833
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2edf08780c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e89f6f343d
								
							
								
							
						 | 
						
							
							
								
								中间库会消费 平阴和下面3个街道的数据 所以去掉
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6953e23a29
								
							
								
							
						 | 
						
							
							
								
								活动详情添加联建活动相关参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								51299f0f4e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c0bc7a7a8f
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.网格员巡查,增加mobile的返回 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e2653d4a3a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d3473ccb42
								
							
								
							
						 | 
						
							
							
								
								添加actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4b058ff2e5
								
							
								
							
						 | 
						
							
							
								
								/resi/act/list/auditing添加actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								57d1619f21
								
							
								
							
						 | 
						
							
							
								
								/heart/resi/act/actlookback添加actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3ed863a176
								
							
								
							
						 | 
						
							
							
								
								/heart/resi/act/list添加actType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								2f0850bbac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5d84824046
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0f496b5b54
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.PC工作端查询网格员数据统计结果列表 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f0d22865c9
								
							
								
							
						 | 
						
							
							
								
								备注
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2bccd614a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6627e28486
								
							
								
							
						 | 
						
							
							
								
								代码优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7c1f10a428
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								727c6305a1
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f7d12ebc38
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_routine_work' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								58cb0cca9b
								
							
								
							
						 | 
						
							
							
								
								【网格员工作统计】巡查记录列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								91bd27cf39
								
							
								
							
						 | 
						
							
							
								
								这些事不正常的
							
							
							
							
								
							
							
						 | 
						4 years ago |