yinzuomei
							
						 | 
						
							
							
							
								
							
								8a69c976b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								48ddc68250
								
							
								
							
						 | 
						
							
							
								
								/heart/resi/act/detail添加返参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ef3ba79a01
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								80af8c8e66
								
							
								
							
						 | 
						
							
							
								
								房屋查询导出 每次1w
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								779eabe9fa
								
							
								
							
						 | 
						
							
							
								
								双实信息录入-小区楼栋编辑剔除系统编码更新
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								104ef63a59
								
							
								
							
						 | 
						
							
							
								
								草稿列表、详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								de66ccb4a7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5ca6bce24d
								
							
								
							
						 | 
						
							
							
								
								追加活动总结内容变更为longtext
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								424c0d992c
								
							
								
							
						 | 
						
							
							
								
								存草稿
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								028f181a16
								
							
								
							
						 | 
						
							
							
								
								列表+工作端小程序增加返参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ff805d2cb7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								25df6e4518
								
							
								
							
						 | 
						
							
							
								
								修改查询导致 导出一户一档
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								808444fc39
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								705fd87add
								
							
								
							
						 | 
						
							
							
								
								表中字段调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d40bd34735
								
							
								
							
						 | 
						
							
							
								
								结束活动
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4fe73d0171
								
							
								
							
						 | 
						
							
							
								
								导入居民查询时bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								527bd9f9fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								75b79d157d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4515f23465
								
							
								
							
						 | 
						
							
							
								
								导入居民查询时bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								b596e47d39
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_point_manage'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								85dbb9731a
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								030b569286
								
							
								
							
						 | 
						
							
							
								
								审核通过.拒绝
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								026f5ad627
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9e62faa944
								
							
								
							
						 | 
						
							
							
								
								导入居民查询时bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								74083c5002
								
							
								
							
						 | 
						
							
							
								
								人员列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								e98514a194
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev_point_manage'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								100a313c28
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								853ae5bf60
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								7b76d2b7c2
								
							
								
							
						 | 
						
							
							
								
								双实信息录入-新增/修改漏洞补充生成单元编码逻辑
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9323769aa6
								
							
								
							
						 | 
						
							
							
								
								列表返回总结标志,详情返回总结内容
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								c09a0df54b
								
							
								
							
						 | 
						
							
							
								
								疫苗接种点,核酸检测点 优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								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 | 
					
				
					
						
							
							
								 
								Jackwang
							
						 | 
						
							
							
							
								
							
								228bb2dfb3
								
							
								
							
						 | 
						
							
							
								
								双实信息录入-获取小区编码添加初始化验证,加长表字段
							
							
							
							
								
							
							
						 | 
						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 | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								c1f59dba16
								
							
								
							
						 | 
						
							
							
								
								【双实录入】统计相关接口问题修改
							
							
							
							
								
							
							
						 | 
						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 |