|  wangxianzhang | 52a1a97356 | Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  wangxianzhang | 9ab3f3396a | Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp | 4 years ago | 
				
					
						|  wangxianzhang | 6979f590e7 | 改错了啊啊啊 | 4 years ago | 
				
					
						|  jianjun | a3399d0cc0 | Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp | 4 years ago | 
				
					
						|  jianjun | e7971fbbbc | 导出方法 | 4 years ago | 
				
					
						|  zxc | a8a0154bd5 | emm | 4 years ago | 
				
					
						|  zxc | bf55425e7a | Merge branch 'wxz_resiimport_temp' into develop # Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java | 4 years ago | 
				
					
						|  zxc | ed2033d26d | 房屋导入修改,存在的更新 | 4 years ago | 
				
					
						|  wangxianzhang | 759ada7236 | 去掉compose文件中注释掉的image:内容 | 4 years ago | 
				
					
						|  jianjun | 6778b9da7b | 添加注释 | 4 years ago | 
				
					
						|  yinzuomei | 1c75cc55ea | 居民录入标签顺序调整为:身份证号、性别、出生日期。 | 4 years ago | 
				
					
						|  wangxianzhang | 85ab5acd0a | Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  jianjun | 38c55669a2 | 房屋添加接口去掉房主必填版本冲突 | 4 years ago | 
				
					
						|  wangxianzhang | 329a1b422c | flyway编号修改 | 4 years ago | 
				
					
						|  wangxianzhang | 51df190253 | Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp | 4 years ago | 
				
					
						|  wangxianzhang | 9bc9b52705 | 居民信息列表表头 所属房屋 修改 | 4 years ago | 
				
					
						|  zxc | caa7b4b4b2 | import 错误信息重复 | 4 years ago | 
				
					
						|  jianjun | bd74456861 | 房屋添加接口去掉房主必填 | 4 years ago | 
				
					
						|  jianjun | 3728132639 | Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp | 4 years ago | 
				
					
						|  jianjun | 5bb10bda1b | 房屋去掉房主必填脚本 | 4 years ago | 
				
					
						|  yinzuomei | 6ced9dbd0e | 列表中性别、身份证号、出生日期的填写顺序调整为身份证号、性别、出生日期 | 4 years ago | 
				
					
						|  wangxianzhang | 6db890c873 | Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  wangxianzhang | e505c9d5ee | 去掉脚本 | 4 years ago | 
				
					
						|  zxc | 4cb11982d1 | Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop | 4 years ago | 
				
					
						|  zxc | 2b9de61853 | import | 4 years ago | 
				
					
						|  wangxianzhang | 35e68b5b86 | Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  wangxianzhang | 397bcaca2f | 户号-》房间号 | 4 years ago | 
				
					
						|  wangxianzhang | 37e392bc2c | 去掉多余flyway | 4 years ago | 
				
					
						|  wangxianzhang | 37b5990291 | Merge branch 'wxz_resiimport_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop | 4 years ago | 
				
					
						|  wangxianzhang | 2f3b1a8da8 | 修改: 1.居民导入-》户号 | 4 years ago | 
				
					
						|  wangxianzhang | 1d70734941 | 修改: 1.居民导入-》户号 | 4 years ago | 
				
					
						|  jianjun | a559948c33 | Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev | 4 years ago | 
				
					
						|  jianjun | 7a3b3b457b | Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev | 4 years ago | 
				
					
						|  jianjun | 77176c0bf4 | feign trix配置线程池参数 | 4 years ago | 
				
					
						|  yinzuomei | b94473a770 | Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev | 4 years ago | 
				
					
						|  yinzuomei | 5d131496bf | Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop # Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java | 4 years ago | 
				
					
						|  yinzuomei | e16c68732b | 报事人大代表和报给组织,pids调整 | 4 years ago | 
				
					
						|  jianjun | a76bbb5ada | Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev | 4 years ago | 
				
					
						|  jianjun | 2bffec01ec | 导入房间报错 | 4 years ago | 
				
					
						|  yinzuomei | a61b78ab8d | Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev | 4 years ago | 
				
					
						|  yinzuomei | 3a0cf66e63 | /gov/org/agency/editagency修改组织信息bugfix2 | 4 years ago | 
				
					
						|  yinzuomei | 756f3de996 | Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev | 4 years ago | 
				
					
						|  yinzuomei | 16cab43752 | /gov/org/agency/editagency修改组织信息bugfix | 4 years ago | 
				
					
						|  wangxianzhang | 656e49e0c9 | 去掉/wechatthird/componentaccesstoken中将accesstoken推送到私有化平台的操作 | 4 years ago | 
				
					
						|  zhaoqifeng | 150593ae62 | Merge branch 'dev_memo' into dev | 4 years ago | 
				
					
						|  yinzuomei | f8b22941a3 | Merge remote-tracking branch 'origin/dev_qr_code' into dev | 4 years ago | 
				
					
						|  yinzuomei | 0fa011430a | Merge remote-tracking branch 'origin/dev_qr_code' into develop | 4 years ago | 
				
					
						|  yinzuomei | 4030e4aa52 | 居民信息采集导出 | 4 years ago | 
				
					
						|  zxc | 384ae1d21a | Merge remote-tracking branch 'origin/dev_qr_code' into develop | 4 years ago | 
				
					
						|  zxc | a13d88ca4e | 微调 | 4 years ago |