yinzuomei
							
						 | 
						
							
							
							
								
							
								d07c40289b
								
							
								
							
						 | 
						
							
							
								
								/gov/org/grid/gridlist平阴通讯录-网格列表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5ac76581e6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1622660bb0
								
							
								
							
						 | 
						
							
							
								
								项目流转/gov/project/trace/departmentstafflist
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								16397c6198
								
							
								
							
						 | 
						
							
							
								
								工作端 获取工作人员所在网格中 加入弃用条件
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2e7e9dc04a
								
							
								
							
						 | 
						
							
							
								
								存在党员审核,存在议题表决中
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a24c07fe4c
								
							
								
							
						 | 
						
							
							
								
								/resi/mine/mygrid/allgridsg居民端用户访问过的网格列表接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0012cbbb93
								
							
								
							
						 | 
						
							
							
								
								customer_grid表添加abandon_flag。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								523951d470
								
							
								
							
						 | 
						
							
							
								
								修改hystrix线程池配置参数
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ed2e228306
								
							
								
							
						 | 
						
							
							
								
								项目网格统计程序调整,统计网格项目的(议题转的、事件上报的、网格员上报事件的)所有数据,不在只是统计议题转的项目
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								89ae2fa567
								
							
								
							
						 | 
						
							
							
								
								备份生成模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4efd53bb10
								
							
								
							
						 | 
						
							
							
								
								网格活跃度统计查询,源数据改查screen_project_data表,这个表平阴的是三个街道和小程序数据都有
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0ec8d05cf8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								b748556401
								
							
								
							
						 | 
						
							
							
								
								-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								07927d5093
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								53f98c8c42
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4c056dfc39
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_grid_project_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fa02b87851
								
							
								
							
						 | 
						
							
							
								
								项目网格日统计 查询网格项目修改,网格的项目不再只是来源议题,也可以来源事件或者网格员上报事件,所以改查项目main表网格数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f33097be1c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								26a9de532e
								
							
								
							
						 | 
						
							
							
								
								修复:居民调动,detail表的type和typeName错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e332c10133
								
							
								
							
						 | 
						
							
							
								
								居民信息导入模板更新
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a3ed034c05
								
							
								
							
						 | 
						
							
							
								
								网格活跃度业务调整上报事件数改为网格内产生的项目数
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								94640edc98
								
							
								
							
						 | 
						
							
							
								
								开启巡查 网格、经纬度必填
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								32cf7d73a1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b79991a743
								
							
								
							
						 | 
						
							
							
								
								类别变动添加 新增/减少后缀
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								216ae8ad2d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								790b74df7a
								
							
								
							
						 | 
						
							
							
								
								居民信息导出因打印日志错误导致
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d4fcf7fd6a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f3c96e227c
								
							
								
							
						 | 
						
							
							
								
								添加user依赖
							
							
							
							
								
							
							
						 | 
						4 years ago |