jianjun
							
						 | 
						
							
							
							
								
							
								16397c6198
								
							
								
							
						 | 
						
							
							
								
								工作端 获取工作人员所在网格中 加入弃用条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f97f4e15e0
								
							
								
							
						 | 
						
							
							
								
								难点堵点详情已读修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								400b1f4703
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e7be685c7d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								334230fa31
								
							
								
							
						 | 
						
							
							
								
								居民端 获取最后一次进入网格 添加弃用状态的判断
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c6c4a896fb
								
							
								
							
						 | 
						
							
							
								
								/article/publishagencylist 党建声音可选发布单位
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d51f66be47
								
							
								
							
						 | 
						
							
							
								
								难点堵点列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6bacc0c76e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								60eb478f57
								
							
								
							
						 | 
						
							
							
								
								/gov/voice/article/agencygridlist 党建声音可选发布范围
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								dbe98fab02
								
							
								
							
						 | 
						
							
							
								
								工作日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2e7e9dc04a
								
							
								
							
						 | 
						
							
							
								
								存在党员审核,存在议题表决中
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								3baa8b9e5c
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								52d19a051c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_memo' into dev_memo
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f52ab1b8d5
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.备忘录-人员关怀、难点堵点、工作日志的word导出接口 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7a3c88a495
								
							
								
							
						 | 
						
							
							
								
								..
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b1bb631860
								
							
								
							
						 | 
						
							
							
								
								resi/guide/stranger/publiclocationgridlist陌生人选择网格+去其他网格看看,添加ABANDON_FLAG='0'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								27110a1bb2
								
							
								
							
						 | 
						
							
							
								
								/resi/guide/stranger/marketcontactinfo去其他网格看看,添加ABANDON_FLAG='0'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1f9dd227e5
								
							
								
							
						 | 
						
							
							
								
								..
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a24c07fe4c
								
							
								
							
						 | 
						
							
							
								
								/resi/mine/mygrid/allgridsg居民端用户访问过的网格列表接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c40df4938e
								
							
								
							
						 | 
						
							
							
								
								难点堵点
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0012cbbb93
								
							
								
							
						 | 
						
							
							
								
								customer_grid表添加abandon_flag。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8dba635743
								
							
								
							
						 | 
						
							
							
								
								工作日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7bef86dded
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8a1bfb496c
								
							
								
							
						 | 
						
							
							
								
								错提代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0663b09b34
								
							
								
							
						 | 
						
							
							
								
								书记日志-消息提醒弹框列表接口初版
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								30f35c723c
								
							
								
							
						 | 
						
							
							
								
								小区重名
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								523951d470
								
							
								
							
						 | 
						
							
							
								
								修改hystrix线程池配置参数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a21c3790c7
								
							
								
							
						 | 
						
							
							
								
								小区重名
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								44484685d5
								
							
								
							
						 | 
						
							
							
								
								warn
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bed41c106b
								
							
								
							
						 | 
						
							
							
								
								党群服务中心删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								804d752ced
								
							
								
							
						 | 
						
							
							
								
								测试下 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								da58fb850b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a649b13e97
								
							
								
							
						 | 
						
							
							
								
								测试下
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								b53bc345e5
								
							
								
							
						 | 
						
							
							
								
								删除错误提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8bbd3dde89
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e382926077
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								151543ef6c
								
							
								
							
						 | 
						
							
							
								
								临时 加大feign核心线程数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								79cec12400
								
							
								
							
						 | 
						
							
							
								
								数据日志代码生成
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								9010f2fc21
								
							
								
							
						 | 
						
							
							
								
								增加:Memo备忘相关dto dao...
							
							
							
							
							
							
								
							
							
							修改:Nacos动态上下线,去掉服务列表日志打印 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								605c532b79
								
							
								
							
						 | 
						
							
							
								
								路径驼峰
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2aa45e4dc5
								
							
								
							
						 | 
						
							
							
								
								mapingurl修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8f0ea3e73c
								
							
								
							
						 | 
						
							
							
								
								修改巡查锁机制
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1968bff922
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_project_stats_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3e8bc953ea
								
							
								
							
						 | 
						
							
							
								
								项目网格统计程序调整,统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据,不在只是统计议题转的项目   程序调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5b455d287f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_project_stats_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4aea47ba2f
								
							
								
							
						 | 
						
							
							
								
								项目增加work_event来源,为网格员上报事件,修改设计到的统计查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ed2e228306
								
							
								
							
						 | 
						
							
							
								
								项目网格统计程序调整,统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据,不在只是统计议题转的项目
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								89ae2fa567
								
							
								
							
						 | 
						
							
							
								
								备份生成模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								588031204c
								
							
								
							
						 | 
						
							
							
								
								项目增加work_event来源,为网格员上报事件,修改设计到的统计查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4efd53bb10
								
							
								
							
						 | 
						
							
							
								
								网格活跃度统计查询,源数据改查screen_project_data表,这个表平阴的是三个街道和小程序数据都有
							
							
							
							
								
							
							
						 | 
						4 years ago |