zxc
							
						 | 
						
							
							
							
								
							
								9c41853fae
								
							
								
							
						 | 
						
							
							
								
								查询房屋信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5ca90bfc07
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								66f22172e8
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c9ae0d499f
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								429555293f
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								532904489a
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								21d6090c7b
								
							
								
							
						 | 
						
							
							
								
								调试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								8d4657f60e
								
							
								
							
						 | 
						
							
							
								
								临时解决异步情况下,主线程结束,子线程request header被清空的bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								df768ceddc
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f128557851
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								90c1ab458e
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								7791c3285c
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								054ba84f1d
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e03798ac3e
								
							
								
							
						 | 
						
							
							
								
								调试:居民导入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								dcf774c5aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e22fb90726
								
							
								
							
						 | 
						
							
							
								
								居民信息导入:增加调试日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								cf0c1ca254
								
							
								
							
						 | 
						
							
							
								
								居民信息导入:增加调试日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								81a007a744
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								5f5053af21
								
							
								
							
						 | 
						
							
							
								
								去掉Async
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								327c3fcec8
								
							
								
							
						 | 
						
							
							
								
								去掉日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								2389fa599b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								542e405e24
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								51be3af9fe
								
							
								
							
						 | 
						
							
							
								
								去掉注解
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b1969a892e
								
							
								
							
						 | 
						
							
							
								
								添加日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1b1a0cc5ec
								
							
								
							
						 | 
						
							
							
								
								@EnableAsync
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4da02542fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8cbccfd1ab
								
							
								
							
						 | 
						
							
							
								
								睡一秒
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								670df8cfc0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fcf5204c96
								
							
								
							
						 | 
						
							
							
								
								添加日志
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3500f0953d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_import' into dev_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								57a0c30b9a
								
							
								
							
						 | 
						
							
							
								
								位置调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1113c5cb63
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3858d98907
								
							
								
							
						 | 
						
							
							
								
								error
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								deb422ad5e
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5731e7adab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_import' into dev_import
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								abcb68b58e
								
							
								
							
						 | 
						
							
							
								
								导入优化调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e78a2b6263
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_import' into dev_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5fc67d7d19
								
							
								
							
						 | 
						
							
							
								
								修改:
							
							
							
							
							
							
								
							
							
							1.是否有正在执行的导入任务 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e89de0591f
								
							
								
							
						 | 
						
							
							
								
								错误信息打印堆栈
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								364a865f92
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_import' into dev_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								7a35bc6e67
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.是否有正在执行的导入任务 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								82b975c6b4
								
							
								
							
						 | 
						
							
							
								
								url
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e290f50a78
								
							
								
							
						 | 
						
							
							
								
								aggopenfeign
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2b493a24d7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_import' into dev_import
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61bdc38bd5
								
							
								
							
						 | 
						
							
							
								
								aggopenfeign
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								680336195d
								
							
								
							
						 | 
						
							
							
								
								提示语
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4c1473c104
								
							
								
							
						 | 
						
							
							
								
								每周一执行,取上个自然周
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cbd729d9dd
								
							
								
							
						 | 
						
							
							
								
								活跃度导出上传oss发钉钉
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eda94b5b02
								
							
								
							
						 | 
						
							
							
								
								temp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ff38e2ba03
								
							
								
							
						 | 
						
							
							
								
								提示拆分
							
							
							
							
								
							
							
						 | 
						4 years ago |