YUJT
							
						 | 
						
							
							
							
								
							
								87fd80e6ce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into shibei_hlpt_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								7840128226
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_zz_wgh'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d906238871
								
							
								
							
						 | 
						
							
							
								
								修改逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								81ddfaf9f3
								
							
								
							
						 | 
						
							
							
								
								人名赋值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d0138dcaaf
								
							
								
							
						 | 
						
							
							
								
								修改剩余部分
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								06c5265351
								
							
								
							
						 | 
						
							
							
								
								修改部分
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								e18b2e8798
								
							
								
							
						 | 
						
							
							
								
								修改逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								c241133869
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into shibei_hlpt_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								0b813fb5de
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_zz_wgh'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								ec564fac96
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								1bae9370ec
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_zz_wgh'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								3c36ee6010
								
							
								
							
						 | 
						
							
							
								
								添加flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d83e9f0bbb
								
							
								
							
						 | 
						
							
							
								
								添加索引的flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								b84fd9d351
								
							
								
							
						 | 
						
							
							
								
								添加索引的flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8f97b975c7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master' into 市北master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dd87b4f21d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e04b5ba225
								
							
								
							
						 | 
						
							
							
								
								按组织查询时 去除空值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								74ba7fa2f9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a816ad21f6
								
							
								
							
						 | 
						
							
							
								
								按组织查询时 去除空值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								076cda8f49
								
							
								
							
						 | 
						
							
							
								
								Revert "按组织查询时 去除空值"
							
							
							
							
							
							
								
							
							
							This reverts commit 4cb19d1f 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5c509397c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4cb19d1f40
								
							
								
							
						 | 
						
							
							
								
								按组织查询时 去除空值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								3353e6e6a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into shibei_hlpt_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a83f604211
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_resi_search_agency'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ba870a4e62
								
							
								
							
						 | 
						
							
							
								
								新增返回字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								39cb2329f5
								
							
								
							
						 | 
						
							
							
								
								修改抛出异常信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								cf7eacc25e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into feature/dev_zz_wgh
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								406070bf00
								
							
								
							
						 | 
						
							
							
								
								添加flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								7e3d101009
								
							
								
							
						 | 
						
							
							
								
								修改flyway脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								caed286df8
								
							
								
							
						 | 
						
							
							
								
								添加flyway脚本,修改视图名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								ac5bd3f780
								
							
								
							
						 | 
						
							
							
								
								添加备注
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								83b76ebc51
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								68dbcd380a
								
							
								
							
						 | 
						
							
							
								
								修改方法名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								f3c2d24a4e
								
							
								
							
						 | 
						
							
							
								
								代码生成,编写存储caResidentUser表数据的接口,编写feignClient,完善绑定网格接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								bca0043614
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into feature/dev_sunjiatan
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								24ac9cefc7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master' into 市北master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								88f47af35e
								
							
								
							
						 | 
						
							
							
								
								绑定房屋修改逻辑,org模块编写feignClient
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								46d85234e4
								
							
								
							
						 | 
						
							
							
								
								badge
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3e43624e11
								
							
								
							
						 | 
						
							
							
								
								badge
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								d1e785cf35
								
							
								
							
						 | 
						
							
							
								
								获取允许申请的积分类别-返回结构调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9bd9d76aa5
								
							
								
							
						 | 
						
							
							
								
								导出房屋状态1:出租 0:自住  2:闲置 3:未售出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2ee8c2512b
								
							
								
							
						 | 
						
							
							
								
								信息采集
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								678c517b5e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								57a8d2d7d7
								
							
								
							
						 | 
						
							
							
								
								徽章没有必要
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								31934197e6
								
							
								
							
						 | 
						
							
							
								
								积分审核详情缺少备注
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								de6ff34324
								
							
								
							
						 | 
						
							
							
								
								服务热线中剔除已被禁用的工作人员
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c469db25d2
								
							
								
							
						 | 
						
							
							
								
								居民信息查询 兼容 按照组织查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								553b063537
								
							
								
							
						 | 
						
							
							
								
								绑定网格接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								0187161a14
								
							
								
							
						 | 
						
							
							
								
								添加根据idCard查询数据的接口,添加flyway脚本,添加feignClient
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								YUJT
							
						 | 
						
							
							
							
								
							
								657b7333d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_sunjiatan'
							
							
							
							
								
							
							
						 | 
						3 years ago |