wanggongfeng
							
						 | 
						
							
							
							
								
							
								44ac0b4692
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								3ca44aeb98
								
							
								
							
						 | 
						
							
							
								
								时间修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0bf8508ed3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								74a5bcc082
								
							
								
							
						 | 
						
							
							
								
								活动详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ff9f8459e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b22c87134d
								
							
								
							
						 | 
						
							
							
								
								党建声音暂存一波
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2c02614be1
								
							
								
							
						 | 
						
							
							
								
								方法模板
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								7a6b6084a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_party_mange'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								29ba18680a
								
							
								
							
						 | 
						
							
							
								
								文章详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								356fcfc67c
								
							
								
							
						 | 
						
							
							
								
								修改排序规则
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								607958e1cc
								
							
								
							
						 | 
						
							
							
								
								列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2293434b95
								
							
								
							
						 | 
						
							
							
								
								漏提文件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1337edbf88
								
							
								
							
						 | 
						
							
							
								
								表字段调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1b72ee380f
								
							
								
							
						 | 
						
							
							
								
								修复:居民党员信息导入 测试环境mq地址错误
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								0cafa08df5
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_test_mq_move' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9b434b0d56
								
							
								
							
						 | 
						
							
							
								
								数字平台-党建声音-文章列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1709719ea2
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'dev_springlog_abandon1' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_springlog_abandon1
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								8d6cb22112
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 BUG
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a81fe11a3e
								
							
								
							
						 | 
						
							
							
								
								导入居民查询时bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								e896c620cf
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 pc 管理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								d17a3a93ce
								
							
								
							
						 | 
						
							
							
								
								补充返回字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								451a908d19
								
							
								
							
						 | 
						
							
							
								
								事件信息根据id查询详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								da63e37192
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 pc 管理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c239f28a22
								
							
								
							
						 | 
						
							
							
								
								修复:【居民信息导入】党员信息同步到partymember库-查询家庭地址中文描述bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								efc79f88a3
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 pc 管理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								41f8482e68
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resiimport_partyinfo
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5e177952b6
								
							
								
							
						 | 
						
							
							
								
								新增:【居民信息导入】党员信息同步到partymember库。相关MQ及服务改动
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								d0bf6e62c0
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								8394c932db
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								499c0f54e9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_5big_coverage'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2ac9f2efa9
								
							
								
							
						 | 
						
							
							
								
								优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一,已有数据直接更新,未改彻底,二次修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b0ed376716
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_rf_syc'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
#	epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								5cf331f029
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 BUG
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1a23fb8c34
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_5big_coverage'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								107872b7cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								37b5ab6ddd
								
							
								
							
						 | 
						
							
							
								
								优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一,已有数据直接更新
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								b202d32885
								
							
								
							
						 | 
						
							
							
								
								事件信息分页
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0acf4d2a14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c9a8b4c31f
								
							
								
							
						 | 
						
							
							
								
								社区查询首页右侧列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								6c0d697306
								
							
								
							
						 | 
						
							
							
								
								事件信息分页
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								53b5c4db37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_5big_coverage'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								ce6a9057a5
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 BUG
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								e0d928535c
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 BUG
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0875fd93db
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								HAHA
							
						 | 
						
							
							
							
								
							
								f8fdc30b67
								
							
								
							
						 | 
						
							
							
								
								添加查询条件
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								dd4b8b7fce
								
							
								
							
						 | 
						
							
							
								
								社区自组织address
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1bdb941b50
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_5big_coverage'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9185f4567c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								bf8321e225
								
							
								
							
						 | 
						
							
							
								
								报错
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								357e8d427f
								
							
								
							
						 | 
						
							
							
								
								生产bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago |