zxc
							
						 | 
						
							
							
							
								
							
								cc0155d913
								
							
								
							
						 | 
						
							
							
								
								放重复提交注解添加,申请接口和审核接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2b4972e789
								
							
								
							
						 | 
						
							
							
								
								批量发送通知bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								ed6dc1a27e
								
							
								
							
						 | 
						
							
							
								
								批量发送通知bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								952b133fa5
								
							
								
							
						 | 
						
							
							
								
								批量发送通知bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								65b05bd569
								
							
								
							
						 | 
						
							
							
								
								Revert "添加个条件"
							
							
							
							
							
							
								
							
							
							This reverts commit 58fc9808 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d1d8a9f3b8
								
							
								
							
						 | 
						
							
							
								
								初始化工作日->废弃服务内部调用的定时 添加脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								43308f84a2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f74805ea21
								
							
								
							
						 | 
						
							
							
								
								初始化工作日->废弃服务内部调用的定时 方法改为post
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e7f3872c7d
								
							
								
							
						 | 
						
							
							
								
								初始化工作日->废弃服务内部调用的定时
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5f9c9d8009
								
							
								
							
						 | 
						
							
							
								
								批量发送通知bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								948251f3f2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								99919895be
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cd15a10e72
								
							
								
							
						 | 
						
							
							
								
								Revert "主键冲突 服务发布"
							
							
							
							
							
							
								
							
							
							This reverts commit 7b8e3907 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7b8e3907c9
								
							
								
							
						 | 
						
							
							
								
								主键冲突 服务发布
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								059d54207f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								46862b8fad
								
							
								
							
						 | 
						
							
							
								
								形成上报查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fddb475e0a
								
							
								
							
						 | 
						
							
							
								
								形成上报查询
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b72ecc6687
								
							
								
							
						 | 
						
							
							
								
								测试要测试
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1c5ab34b4d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1bd8b75e8c
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4178c25598
								
							
								
							
						 | 
						
							
							
								
								-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bfef176b33
								
							
								
							
						 | 
						
							
							
								
								监听居民信息变动 如果是删除或者新增 则更新是否居民状态
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e901f70541
								
							
								
							
						 | 
						
							
							
								
								emm bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								9c3969b85e
								
							
								
							
						 | 
						
							
							
								
								修复:-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								dad3dc59aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								bf7e7f4109
								
							
								
							
						 | 
						
							
							
								
								修复:-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								29011bf20b
								
							
								
							
						 | 
						
							
							
								
								居民检索序号
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								83e083d07c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								25035f51bc
								
							
								
							
						 | 
						
							
							
								
								修复:-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								42fa7cdf95
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev' and 'dev_epidemic_situation' of http://121.42.41.42:7070/r/epmet-cloud into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								abeff79831
								
							
								
							
						 | 
						
							
							
								
								修复:-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5bbf5af198
								
							
								
							
						 | 
						
							
							
								
								修复:-
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								afe68a52d7
								
							
								
							
						 | 
						
							
							
								
								列表增加排序、表增加查询用索引
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								a5eec335b6
								
							
								
							
						 | 
						
							
							
								
								修复:1.核酸检测结果填入核酸检测地址导致sql报错的bug。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a93f0a9034
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								02525ad799
								
							
								
							
						 | 
						
							
							
								
								zhushixia
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6bea405d99
								
							
								
							
						 | 
						
							
							
								
								导出核酸错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3630256dae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								58fc98085b
								
							
								
							
						 | 
						
							
							
								
								添加个条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c2d920b192
								
							
								
							
						 | 
						
							
							
								
								修复:1.核酸检测导入,去掉检测地点必填校验;2.没有错误/提示行,不下载描述文件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5155f7b38f
								
							
								
							
						 | 
						
							
							
								
								/gov/org/house/housedel内部调用/gov/org/house/delete
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								799341a62b
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7e6b5d1979
								
							
								
							
						 | 
						
							
							
								
								添加状态
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								d960748180
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								09d9b4d873
								
							
								
							
						 | 
						
							
							
								
								导入核酸检测:更新了,或者是跳过了,都算是成功的,只有出现异常,或者信息确实校验不通过,才算是失败
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0b9100a8ea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d8f723a873
								
							
								
							
						 | 
						
							
							
								
								redis
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								703abd3c6a
								
							
								
							
						 | 
						
							
							
								
								需求调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								4f3a8de21a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								6cbd70cc26
								
							
								
							
						 | 
						
							
							
								
								导入核酸检测:针对新需求重构
							
							
							
							
								
							
							
						 | 
						4 years ago |