Tree: 75b79d157d

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '75b79d157d'

${ noResults }

Commit Graph

21895 Commits (75b79d157d76a74bb8b30c88e837321e643f8076)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	75b79d157d	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'	3 years ago
jianjun	4515f23465	导入居民查询时bug	3 years ago
jianjun	026f5ad627	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'	3 years ago
jianjun	9e62faa944	导入居民查询时bug	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
wanggongfeng	c09a0df54b	疫苗接种点，核酸检测点 优化	3 years ago
wanggongfeng	44ac0b4692	疫苗接种点，核酸检测点 优化	3 years ago
HAHA	7a6b6084a2	Merge branch 'dev_party_mange'	3 years ago
HAHA	356fcfc67c	修改排序规则	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
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
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
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
wanggongfeng	ce6a9057a5	疫苗接种点，核酸检测点 BUG	3 years ago
wanggongfeng	e0d928535c	疫苗接种点，核酸检测点 BUG	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