yinzuomei
							
						 | 
						
							
							
							
								
							
								6c8cb1797f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tmdata'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5360a09b92
								
							
								
							
						 | 
						
							
							
								
								脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								39e1436ca4
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ca3842b002
								
							
								
							
						 | 
						
							
							
								
								关于隔离状态字典表问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								be0b2881e6
								
							
								
							
						 | 
						
							
							
								
								id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c3286c88cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2d4caaef63
								
							
								
							
						 | 
						
							
							
								
								磐石阴阳性取值错误问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								599cc52226
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5f6d9fdabd
								
							
								
							
						 | 
						
							
							
								
								81,82,生产80已经发了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								56265e57a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								24320e97eb
								
							
								
							
						 | 
						
							
							
								
								80
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dddc957062
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_compare_data
							
							
							
							
							
							
								
							
							
							 Conflicts:
	epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java
	epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b9834e88ee
								
							
								
							
						 | 
						
							
							
								
								user80
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dc49dcef00
								
							
								
							
						 | 
						
							
							
								
								等会回来切换脚本版本号
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								24f1d574e3
								
							
								
							
						 | 
						
							
							
								
								未做核酸比对,增加备注、采样时间。 修改了下查询接口,还有导出sql
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								483f916b03
								
							
								
							
						 | 
						
							
							
								
								磐石删除年龄字段引起的调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								afa5738b9b
								
							
								
							
						 | 
						
							
							
								
								程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0bb1274058
								
							
								
							
						 | 
						
							
							
								
								全删 不需要校验
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								998e5a0a4f
								
							
								
							
						 | 
						
							
							
								
								删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								13e280fc7e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								718dd0d011
								
							
								
							
						 | 
						
							
							
								
								咱是放开测磐石
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c2f14b032a
								
							
								
							
						 | 
						
							
							
								
								不用打印error, 已经在excel里了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b482e5582b
								
							
								
							
						 | 
						
							
							
								
								调了调宽度,加了个信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								452367a3ce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6f243c373e
								
							
								
							
						 | 
						
							
							
								
								户籍地只要磐石必填
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								89cd99e66d
								
							
								
							
						 | 
						
							
							
								
								导入提示
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fe27805d9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9bef7ca146
								
							
								
							
						 | 
						
							
							
								
								ZUZHIid
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a2dcf858be
								
							
								
							
						 | 
						
							
							
								
								/icpartyactivity/search联建活动,列表查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b11a0123e
								
							
								
							
						 | 
						
							
							
								
								详情增加返参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								3eda761cc2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c96b063dd7
								
							
								
							
						 | 
						
							
							
								
								sql脚本
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d4d9bd6f3a
								
							
								
							
						 | 
						
							
							
								
								/heart/icpartyunit/list 联建单位列表本组织及下级
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								188816c1d5
								
							
								
							
						 | 
						
							
							
								
								风险地区倒序
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fc5d2680c8
								
							
								
							
						 | 
						
							
							
								
								新增时间字段格式
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								35a3c587e6
								
							
								
							
						 | 
						
							
							
								
								新增是磐石7天旅居史赋默认值
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								83aac2dc0a
								
							
								
							
						 | 
						
							
							
								
								居民防疫列表查询调整下
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8e4ba0710b
								
							
								
							
						 | 
						
							
							
								
								导出调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7e23b0862c
								
							
								
							
						 | 
						
							
							
								
								加上**
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								fcefb9e355
								
							
								
							
						 | 
						
							
							
								
								导出程序调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								66fba53334
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_partymember_sync' into dev_partymember_sync
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								405b03b50f
								
							
								
							
						 | 
						
							
							
								
								调整记录更换排序字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								332693bab2
								
							
								
							
						 | 
						
							
							
								
								关于excel最后一列值接不到问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f4f694ed21
								
							
								
							
						 | 
						
							
							
								
								保存增加参数校验
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c2a1d6568a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fca22e4ccd
								
							
								
							
						 | 
						
							
							
								
								管控开始时间、管控结束时间单元格改为本文格式
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								86fa1f40e0
								
							
								
							
						 | 
						
							
							
								
								党员信息同步
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b14b677b6f
								
							
								
							
						 | 
						
							
							
								
								字段变更
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b12e917695
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								53cae0981a
								
							
								
							
						 | 
						
							
							
								
								字典表值翻转
							
							
							
							
								
							
							
						 | 
						3 years ago |