wangxianzhang
							
						 | 
						
							
							
							
								
							
								6b3a0ef72b
								
							
								
							
						 | 
						
							
							
								
								新增:居民信息导入,增加:新阶层人士
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9dd3976090
								
							
								
							
						 | 
						
							
							
								
								ic_resi_user新增is_xjc;修改居民类别查询方法
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								cafdb78cb1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_information_register'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								acfccc53f4
								
							
								
							
						 | 
						
							
							
								
								信息采集导出  列名改为单位名称
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								8fc4bdc4ab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								167c020745
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								0e3fb2f5f6
								
							
								
							
						 | 
						
							
							
								
								信息采集审核 居民户籍地添加
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								edb67bd3bd
								
							
								
							
						 | 
						
							
							
								
								去重
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								21ccdc14bc
								
							
								
							
						 | 
						
							
							
								
								同一房间号两次提交调整为两条申请单
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								906538604d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2ab866188c
								
							
								
							
						 | 
						
							
							
								
								项目进展 同步显示
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								1876b32d50
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								08cc15cb1a
								
							
								
							
						 | 
						
							
							
								
								信息采集审核按钮添加权限
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								4b1db66e5f
								
							
								
							
						 | 
						
							
							
								
								collect sql完善
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								9a243aae5e
								
							
								
							
						 | 
						
							
							
								
								更新成员客户id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								941f135d7a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Optimize_code_dev_1'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								176d2edecf
								
							
								
							
						 | 
						
							
							
								
								开发环境排错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								c36e804e21
								
							
								
							
						 | 
						
							
							
								
								开发环境排错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								6ee6811f7b
								
							
								
							
						 | 
						
							
							
								
								二维码设置初始版本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								b1d39977dd
								
							
								
							
						 | 
						
							
							
								
								开发环境排错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d92daf531d
								
							
								
							
						 | 
						
							
							
								
								开发环境排错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								b8a1fce5f5
								
							
								
							
						 | 
						
							
							
								
								小区码、社区码添加社区名称
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								4336747fb6
								
							
								
							
						 | 
						
							
							
								
								修改返回字段名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								0404255b42
								
							
								
							
						 | 
						
							
							
								
								获取详情时同时获取网格排序字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								2547be29f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								22c3c91036
								
							
								
							
						 | 
						
							
							
								
								信息采集审核bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								76195208f6
								
							
								
							
						 | 
						
							
							
								
								修改排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7158f46c92
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d67be733a3
								
							
								
							
						 | 
						
							
							
								
								组织code 变更时 发送消息携带 修改前的code,便于同步平阴数据时处理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								b9631f647f
								
							
								
							
						 | 
						
							
							
								
								修改排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								3fd33e497c
								
							
								
							
						 | 
						
							
							
								
								修改排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								035102c0ed
								
							
								
							
						 | 
						
							
							
								
								修改排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								098b9ec2a2
								
							
								
							
						 | 
						
							
							
								
								我的登记列表添加审核原因
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								5845ebe6bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/visitor_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								b03bea4745
								
							
								
							
						 | 
						
							
							
								
								居民信息采集详情添加社区id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								ec5b28c8f9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								bf8cc12283
								
							
								
							
						 | 
						
							
							
								
								信息采集审核
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								471aa20811
								
							
								
							
						 | 
						
							
							
								
								调整数据库脚本版本号
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1bed7d8884
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bug_select_staff'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b8651d565e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_user_match_grid'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								06ce0211b7
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4456ea5d55
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								a825c96b24
								
							
								
							
						 | 
						
							
							
								
								还原
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f9b5c74ddb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b0db08200a
								
							
								
							
						 | 
						
							
							
								
								新增部门
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								863b10523c
								
							
								
							
						 | 
						
							
							
								
								shandiao
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								9a4fa92cc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_project_hd_syc'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								0c543dd1cc
								
							
								
							
						 | 
						
							
							
								
								应杨坤要求项目管理列表和导出的图片展示创建节点和结案节点的图片
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								c768ba966f
								
							
								
							
						 | 
						
							
							
								
								补充数据库脚本;删除IS_PARTY字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								945d6b602a
								
							
								
							
						 | 
						
							
							
								
								?
							
							
							
							
								
							
							
						 | 
						3 years ago |