zhangyuan
							
						 | 
						
							
							
							
								
							
								dda6af3edb
								
							
								
							
						 | 
						
							
							
								
								审核前后数据对比
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								c7b47f629c
								
							
								
							
						 | 
						
							
							
								
								更新结束后在更新本体
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								cf3e4eda0b
								
							
								
							
						 | 
						
							
							
								
								判断审核成功才通过
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								c8d54375bd
								
							
								
							
						 | 
						
							
							
								
								审核功能
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								1e604312e2
								
							
								
							
						 | 
						
							
							
								
								同时匹配所有情况
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								2b21b0324e
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								fb0af0360b
								
							
								
							
						 | 
						
							
							
								
								无身份证默认只导入房屋
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								61d0674748
								
							
								
							
						 | 
						
							
							
								
								排除新增的房屋
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								5839856f06
								
							
								
							
						 | 
						
							
							
								
								修改BUG
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								3469a0fdcf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								44c1218cfb
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								4385aecd3d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								f0760b3456
								
							
								
							
						 | 
						
							
							
								
								更新房屋码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								0c9dd68511
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								404c509030
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								3e489004f6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								175b43ca6a
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								0e65822e46
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								62f50c4184
								
							
								
							
						 | 
						
							
							
								
								加上网格参数
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								f90434e9a5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b015b1df1a
								
							
								
							
						 | 
						
							
							
								
								去ID
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								7dfccf38e8
								
							
								
							
						 | 
						
							
							
								
								修改页面查询逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								ea2253451f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								2e17236e06
								
							
								
							
						 | 
						
							
							
								
								返回单元信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								6653f77d86
								
							
								
							
						 | 
						
							
							
								
								冗余
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								3d32a9c05f
								
							
								
							
						 | 
						
							
							
								
								完善信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b96d5effc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								d1db921fa3
								
							
								
							
						 | 
						
							
							
								
								判断条件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								e0b67763c0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								83da581f1d
								
							
								
							
						 | 
						
							
							
								
								合并保存逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								6c634afc05
								
							
								
							
						 | 
						
							
							
								
								无用代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								22b57e4a41
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								cf07d10344
								
							
								
							
						 | 
						
							
							
								
								还原代码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								6862565d76
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epdc-cloud-custom-yushan
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								13661f4f53
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								709b5f6395
								
							
								
							
						 | 
						
							
							
								
								保存单元自增ID
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								d0ff57a086
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								2f9a916315
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/user_house_import' into feature/user_house_import
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								6c7ea635c1
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								66a7598070
								
							
								
							
						 | 
						
							
							
								
								更新房屋编码
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								f7f1e3c590
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								b22228b92c
								
							
								
							
						 | 
						
							
							
								
								我的家庭工作端相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								c5a3a26c38
								
							
								
							
						 | 
						
							
							
								
								微调文字偏移量
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								7122194b46
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/user_house_import' into feature/user_house_import
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								e71e3f3ade
								
							
								
							
						 | 
						
							
							
								
								我的家庭相关接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								82fb87ffde
								
							
								
							
						 | 
						
							
							
								
								类型转换
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								bd668ffbea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/user_house_import'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								6445268c37
								
							
								
							
						 | 
						
							
							
								
								format
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								bcfc1bef6f
								
							
								
							
						 | 
						
							
							
								
								只能批量下载单个网格数据
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								1a23d88862
								
							
								
							
						 | 
						
							
							
								
								禁止房屋重复新增
							
							
							
							
								
							
							
						 | 
						3 years ago |