wangxianzhang
							
						 | 
						
							
							
							
								
							
								064e2d489c
								
							
								
							
						 | 
						
							
							
								
								【图层】完善:针对新增的volunteer这个placetype适配查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								aa64287a0f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0e078901e9
								
							
								
							
						 | 
						
							
							
								
								【图层】sql表结构
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ec15eae342
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9d39b01163
								
							
								
							
						 | 
						
							
							
								
								duole ,
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1fbdc3df65
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化-补充
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c4abc48886
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								b4a04e73d9
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化- 1.将右侧资源的quantity查询改为多线程
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1c9237e0de
								
							
								
							
						 | 
						
							
							
								
								shishi
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								807099a812
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3491736659
								
							
								
							
						 | 
						
							
							
								
								layixia
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1d51987a7e
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化- 1.将左侧被管理对象的quantity查询改为多线程
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								59d503b609
								
							
								
							
						 | 
						
							
							
								
								五大图层首页
							
							
							
							
							
							
								
							
							
							todo资源列表分页 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								df648c51c5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								823d2036a8
								
							
								
							
						 | 
						
							
							
								
								zhan
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d37a56cbbf
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a9cabcf8f3
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								00aa3c054d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								199872f37e
								
							
								
							
						 | 
						
							
							
								
								短信OK
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d776d6aa55
								
							
								
							
						 | 
						
							
							
								
								居民、事件、资源详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bd17561753
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								973d88fd9d
								
							
								
							
						 | 
						
							
							
								
								duanxin
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2c9d66709c
								
							
								
							
						 | 
						
							
							
								
								又暂提了搜索
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								06447f68f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								3678169c94
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化- 1.将返回的左右菜单跟menu绑定;2.并且将公共服务人群的返回,从category_dict中取,然后跟oper_customize.ic_resi_category_warn_config中对应
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5177ad4541
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								257ec3c2be
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								390d0a6408
								
							
								
							
						 | 
						
							
							
								
								又暂提了搜索
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								122be4cace
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								452b6d75f5
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化-左侧菜单增加menu控制
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								73e0136299
								
							
								
							
						 | 
						
							
							
								
								通讯录部门列表增加返参,部门加人、删除操作增加判断
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								09b22bbc59
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bb57374c87
								
							
								
							
						 | 
						
							
							
								
								z综合治理人群,公共服务,这些居民,显示姓名(身份证号)
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								36a89abc4a
								
							
								
							
						 | 
						
							
							
								
								漏提
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ed31dba2c8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9c71c97798
								
							
								
							
						 | 
						
							
							
								
								社会自组织、联建单位列表增加返参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30c3dd1910
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4a70c11598
								
							
								
							
						 | 
						
							
							
								
								公共服务人群
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								90d2d7b14a
								
							
								
							
						 | 
						
							
							
								
								暂提搜索
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c87bf8e540
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								54e47611a2
								
							
								
							
						 | 
						
							
							
								
								【图层】可视化,做了一些优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								dd6aa8efbc
								
							
								
							
						 | 
						
							
							
								
								新增联建单位负责人、社区自组织负责人两个默认角色不允许删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0ce06e1806
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9f2c565e68
								
							
								
							
						 | 
						
							
							
								
								联建单位、社会自组织删除时增加判断是否同步到通讯录 是否有未办结项目
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e5a9a3be4f
								
							
								
							
						 | 
						
							
							
								
								安全生产隐患2
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								77a478bfac
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								960c302644
								
							
								
							
						 | 
						
							
							
								
								安全生产隐患
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3661de73e3
								
							
								
							
						 | 
						
							
							
								
								联建单位、社会自组织取消同步操作
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c06a8c829
								
							
								
							
						 | 
						
							
							
								
								事件内容20字
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1f9e1c21c8
								
							
								
							
						 | 
						
							
							
								
								城市管理事件
							
							
							
							
								
							
							
						 | 
						3 years ago |