Tree: 6c4a2cde55

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '6c4a2cde55'

${ noResults }

Commit Graph

21898 Commits (6c4a2cde5524443bda5b8e7c4c3a05eccbea52fd)

 

All Branches   

Search

Author	SHA1	Message	Date
wangxianzhang	6c4a2cde55	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
jianjun	b76cf0c881	heart地址不对	3 years ago
wangxianzhang	c239f28a22	修复：【居民信息导入】党员信息同步到partymember库-查询家庭地址中文描述bug	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
sunyuchao	499c0f54e9	Merge branch 'dev_5big_coverage'	3 years ago
sunyuchao	2ac9f2efa9	优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一，已有数据直接更新,未改彻底，二次修改	3 years ago
jianjun	0210cc9243	Merge remote-tracking branch 'remotes/origin/master' into 烟台master	3 years ago
jianjun	bf11b49df5	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master # Conflicts: # 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	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
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
zxc	0acf4d2a14	Merge branch 'dev_bugfix_ljj'	3 years ago
zxc	c9a8b4c31f	社区查询首页右侧列表	3 years ago
yinzuomei	53b5c4db37	Merge remote-tracking branch 'origin/dev_5big_coverage'	3 years ago
yinzuomei	0875fd93db	update	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
wangxianzhang	7a3c8d91b8	Merge branches 'dev_5big_coverage', 'master' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
wangxianzhang	63727808e2	-	3 years ago
wangxianzhang	920286940e	Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
wangxianzhang	6e36107a9c	-	3 years ago
wangxianzhang	1fb34937ba	Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud	3 years ago
wangxianzhang	5245c449c0	【五大图层】按照图层-placeType-sort排序，将同一个placeType排到一起	3 years ago
jianjun	2c7df223d7	Merge remote-tracking branch 'remotes/origin/dev_5big_coverage'	3 years ago
wangxianzhang	a670cc6b96	【五大图层】修复：特殊人群社区矫正列表数量与居民信息中不对应（因为status=0正常缺少条件）；修复：群租房缺少"rent_flag"条件	3 years ago
YUJT	1ca4683a29	Merge branch 'feature/dev_sunjiatan_moveout'	3 years ago
jianjun	d99854e712	Merge remote-tracking branch 'remotes/origin/dev_5big_coverage' # Conflicts: # 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	3 years ago
jianjun	9961f16461	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'	3 years ago
jianjun	b647eb1b22	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/empet_cloud_yantai; branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 烟台master	3 years ago
jianjun	e75a1d6892	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_master	3 years ago
jianjun	1c7b7ecad5	bug	3 years ago
zhaoqifeng	36cac46679	迁出逻辑修改	3 years ago
jianjun	0909c71875	Merge remote-tracking branch 'remotes/origin/yantai_master' into 烟台master	3 years ago
jianjun	75b006fe13	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_master	3 years ago
jianjun	d6c8159347	bug	3 years ago
jianjun	87a46ea9c3	bug	3 years ago
jianjun	cedb2dae3f	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_master	3 years ago
jianjun	60e0cc73eb	bug	3 years ago
wangxianzhang	cba5be0cb1	Merge remote-tracking branch 'origin/master'	3 years ago
wangxianzhang	ad3d556678	【居民信息导入】修复:兼容cascader空间的bug	3 years ago
jianjun	ff34a61581	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'	3 years ago
YUJT	6f64dc05a0	Merge branch 'feature/dev_sunjiatan_moveout'	3 years ago
YUJT	13e0c5ae1d	Merge branch 'dev_party_mange'	3 years ago
zhaoqifeng	028d568c87	驳回原因不能为空 (cherry picked from commit e95168c269)	3 years ago
jianjun	e10560de97	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/empet_cloud_yantai; branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 烟台master	3 years ago