jianjun
							
						 | 
						
							
							
							
								
							
								85039539c8
								
							
								
							
						 | 
						
							
							
								
								加入市北-居民分类分析数据
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								8c33f2cbf9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_optimize_for_ic' into 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
							
						 | 
						
							
							
							
								
							
								fb2e75ab29
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5eb0e8bc53
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_sb_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								e868d491e5
								
							
								
							
						 | 
						
							
							
								
								社区治理-项目处理分析-右侧地图数据先暂定查询两千条 防止内存溢出
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								65b730a5ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_sb_syc' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								61331fe011
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						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
							
						 | 
						
							
							
							
								
							
								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 | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								cf5d16830b
								
							
								
							
						 | 
						
							
							
								
								again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								cf5f86dd79
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							代码错误,编译不通过 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2f6548cfef
								
							
								
							
						 | 
						
							
							
								
								/gov/org/building/treelist返参增加showNum
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								10c1766501
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.居民导入excel,调整、以及注释的丰富 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ef9633c537
								
							
								
							
						 | 
						
							
							
								
								again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a0aff3425c
								
							
								
							
						 | 
						
							
							
								
								again
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								0889bec4ab
								
							
								
							
						 | 
						
							
							
								
								项目研判分析按分类查询数据兼容市北多层级分类以及不是来源话题的议题补录一条关于话题数据(project_related_personnel) 话题id为空的问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								69407626f2
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.社区搜索(居民):conditions为null的bug
2.社区搜索(房屋):逻辑错误 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b6fa983c5f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								19aacaa867
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_diaodong
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								aae6afdaa7
								
							
								
							
						 | 
						
							
							
								
								local 不打印错误日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								182ae42e4d
								
							
								
							
						 | 
						
							
							
								
								userwarnlist旧接口改造
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d3e06d961
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_ic_diaodong' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_diaodong
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								034cf8e533
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								444a169393
								
							
								
							
						 | 
						
							
							
								
								居民信息里列表分类赋值修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c7e769c08b
								
							
								
							
						 | 
						
							
							
								
								注释日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a8aef62c40
								
							
								
							
						 | 
						
							
							
								
								引入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bc45273f95
								
							
								
							
						 | 
						
							
							
								
								方法改回
							
							
							
							
								
							
							
						 | 
						4 years ago |