jianjun
							
						 | 
						
							
							
							
								
							
								85039539c8
								
							
								
							
						 | 
						
							
							
								
								加入市北-居民分类分析数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cd4d4b435a
								
							
								
							
						 | 
						
							
							
								
								again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a7d48d0694
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fe53843355
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_diaodong' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a63a048cea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4aee21a14c
								
							
								
							
						 | 
						
							
							
								
								初始新增变更记录数据时18类都为否的也要有变更记录数据只是没有明细数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3eca679ef6
								
							
								
							
						 | 
						
							
							
								
								foric 小区管理showName
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8af1a68285
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8c33f2cbf9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize_for_ic' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								23cc365499
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a75abc1e23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a608e53d7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_diaodong' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e516b3e6b9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0d5f36f4b7
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.flyway脚本的字段长度问题fix 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dda580447d
								
							
								
							
						 | 
						
							
							
								
								sql长度
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bfaaf12738
								
							
								
							
						 | 
						
							
							
								
								diaodong分支上线。9个服务版本号+1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a0bad455dd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fb2e75ab29
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5033bcb005
								
							
								
							
						 | 
						
							
							
								
								again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ddbc39aa3a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5eb0e8bc53
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_sb_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e868d491e5
								
							
								
							
						 | 
						
							
							
								
								社区治理-项目处理分析-右侧地图数据先暂定查询两千条 防止内存溢出
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								13e8c33c15
								
							
								
							
						 | 
						
							
							
								
								修改user内存 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b0a01ba36f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7d6e9852fa
								
							
								
							
						 | 
						
							
							
								
								修改user内存
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2b23adaf38
								
							
								
							
						 | 
						
							
							
								
								社会组织、社区自组织、区域化党建单位未解决的不给分
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5c2558f4d7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1363855c5b
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.居民信息导入的bug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9bbe2a350e
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0072644c84
								
							
								
							
						 | 
						
							
							
								
								数据删除 分批处理
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								28f4918158
								
							
								
							
						 | 
						
							
							
								
								市北研判分析分类处理发布生产
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								27dbc62c6e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								65b730a5ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_sb_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								61331fe011
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9e0ee9ac13
								
							
								
							
						 | 
						
							
							
								
								数据统计升级 事件上报-办结关系修改,办结层级是网格的为自办,不是网格的为上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								8f92897b99
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								9ee5f366f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c0a8544306
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								17aebb4e02
								
							
								
							
						 | 
						
							
							
								
								事件上报-办结关系修改,办结层级是网格的为自办,不是网格的为上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								56e0b68937
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5bb47453ac
								
							
								
							
						 | 
						
							
							
								
								人员类别分析统计库,脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								71bfa90582
								
							
								
							
						 | 
						
							
							
								
								需求指派社会组织下拉框改为与社会组织列表一致:展示当前工作人员所属组织建立的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d00fe79c45
								
							
								
							
						 | 
						
							
							
								
								旧接口添加新的筛选条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4623a8fe8e
								
							
								
							
						 | 
						
							
							
								
								/heart/serviceitem/dict-list增加入参type
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								515fe692a7
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								3aee052b9c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c2eba4b183
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_ic_diaodong
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								fd4cccef30
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.居民信息导入,排除不必要的列的校验 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								caf71e1e3b
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.调动居民的时候,只增加了调动记录,没增加类别变更记录的bug 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1add5cff17
								
							
								
							
						 | 
						
							
							
								
								/gov/org/building/treelist返参增加showName
							
							
							
							
								
							
							
						 | 
						4 years ago |