wanggongfeng
							
						 | 
						
							
							
							
								
							
								0c09f54489
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/userDtoJar'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								a21c8a6339
								
							
								
							
						 | 
						
							
							
								
								福利人员导入,身份证校验不校验X大小写
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								66a6e8542f
								
							
								
							
						 | 
						
							
							
								
								完善疫苗接种记录关系表数据同步逻辑-----改为台账类型
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								272aa6dc32
								
							
								
							
						 | 
						
							
							
								
								居民端首页实时动态查询文章bugfix
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								402b3bdbc6
								
							
								
							
						 | 
						
							
							
								
								GovOrgOpenFeignClient,梳理房屋接口,加了些备注
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								2998e63693
								
							
								
							
						 | 
						
							
							
								
								完善疫苗接种记录关系表数据同步逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								114bb89925
								
							
								
							
						 | 
						
							
							
								
								去除log
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2de1bb2236
								
							
								
							
						 | 
						
							
							
								
								小寨子居民信息列表改个排序
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								bda12cee7c
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步添加提测
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								9d452975ec
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步添加提测
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								5fb7640b08
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步添加log
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								3d99e50efd
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步添加log
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								fdf42063f5
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步添加log
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								fd93a49fe8
								
							
								
							
						 | 
						
							
							
								
								租房合同,居民信息,疫苗接种情况,合同信息同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								eb19154b23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/userDtoJar'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								c5c3744cea
								
							
								
							
						 | 
						
							
							
								
								福利人员导入----列表查询sql修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								6e167e51cf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/userDtoJar' into feature/rentalRevision
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								c58eab3064
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/userDtoJar'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								8ec945ba3e
								
							
								
							
						 | 
						
							
							
								
								居民信息同步-添加疫苗接种详细信息DTO
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								63d68e12e5
								
							
								
							
						 | 
						
							
							
								
								报个错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3bc734a4e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cd00af45a5
								
							
								
							
						 | 
						
							
							
								
								getMyselfMsg修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								25346f66ff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3f093f670f
								
							
								
							
						 | 
						
							
							
								
								sql优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a1355f469f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2963ab7cb6
								
							
								
							
						 | 
						
							
							
								
								来源于小寨子:人房概览/gov/org/house/subuserhouselist按照网格升序
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6c773138fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1331a1f737
								
							
								
							
						 | 
						
							
							
								
								【核酸检测 & 疫苗接种同步】代码调整,添加注释
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								f76ab49554
								
							
								
							
						 | 
						
							
							
								
								居民信息同步-添加合同开始结束时间
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								67cfd47b58
								
							
								
							
						 | 
						
							
							
								
								居民信息同步-添加合同开始结束时间
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								78c296903f
								
							
								
							
						 | 
						
							
							
								
								【异步数据同步】调整分布式锁的时间参数
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1d063554e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								5869192566
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rentalRevision'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								29a4f4eb4f
								
							
								
							
						 | 
						
							
							
								
								福利人员导入-----修改加入时间日期格式
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								76a8f074a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rentalRevision'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5d031346a5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								625c43bd56
								
							
								
							
						 | 
						
							
							
								
								【疫情防控】信息同步器,取锁判空
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								92da71db35
								
							
								
							
						 | 
						
							
							
								
								添加获取当前登录人的所属社区接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								ad5f102e23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								46189fce34
								
							
								
							
						 | 
						
							
							
								
								福利人员导入----排除证件号为空的情况
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								897ecfac27
								
							
								
							
						 | 
						
							
							
								
								福利人员导入----逻辑修改2
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								369ee31801
								
							
								
							
						 | 
						
							
							
								
								福利人员导入----逻辑修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1c28b6772f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2704a428cb
								
							
								
							
						 | 
						
							
							
								
								修改文章置顶
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5d169fcb2d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_matter_1128_syc'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b16d69b099
								
							
								
							
						 | 
						
							
							
								
								备注
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6c50acb57c
								
							
								
							
						 | 
						
							
							
								
								数据配置列表排序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								2c42ce3f45
								
							
								
							
						 | 
						
							
							
								
								修改:核酸检测清理,增加定时任务:icNatClearTask
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								8b7aeb94cf
								
							
								
							
						 | 
						
							
							
								
								修改:调整核酸检测列表查询sql
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								44026f8d0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_matter_1128_syc' into dev_matter_1128_syc
							
							
							
							
								
							
							
						 | 
						3 years ago |