Tree: 1489e82ad3

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1489e82ad3'

${ noResults }

Commit Graph

15595 Commits (1489e82ad321d2bfca6bb41cd39f09ff85f78f07)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	1815be9515	Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data	4 years ago
wangxianzhang	6f806c407d	Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
yinzuomei	3a31907338	Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data Conflicts: epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml	4 years ago
wangxianzhang	d21721c227	Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data	4 years ago
wangxianzhang	6dcbe3c023	新增： 1.志愿者坐标分布统计定时任务	4 years ago
yinzuomei	38c9211024	Merge remote-tracking branch 'origin/dev_ic_v2' into develop # Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java # epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml # epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml	4 years ago
yinzuomei	a1dc0941b6	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	397b2c367f	Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data	4 years ago
yinzuomei	4cbfd6f1a7	wangle fuzhi	4 years ago
yinzuomei	7908623213	区域化党建单位群众满意度	4 years ago
sunyuchao	6e4adcb198	组织下网格列表	4 years ago
zxc	03181c0445	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
zxc	d75280f49e	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	81ff0f4893	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	013283d7c9	需求研判分析返参调整	4 years ago
yinzuomei	eb4e4df5e0	计算群众满意度	4 years ago
wangxianzhang	bc326ca761	Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	3333b47141	Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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	4 years ago
wangxianzhang	990031cbf0	新增： 1.志愿者坐标分布 2.志愿者信息简介	4 years ago
yinzuomei	8fcd4a2a72	SystemMessageType.CAL_PARTY_UNIT_SATISFACTION	4 years ago
yinzuomei	cd43854e7b	SystemMessageType.CAL_PARTY_UNIT_SATISFACTION	4 years ago
yinzuomei	87f1cbdd37	cal_party_unit_satisfaction	4 years ago
yinzuomei	4e7fc38f94	CalPartyUnitSatisfactionFormDTO	4 years ago
yinzuomei	5e740ecb3a	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	9a4e5e6b20	test2.1	4 years ago
yinzuomei	2e7bdb3d38	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	0ceaf6c5d0	test2	4 years ago
yinzuomei	8b8c912c51	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
yinzuomei	a021aefa03	test	4 years ago
yinzuomei	fb4d66b32d	Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data	4 years ago
yinzuomei	837b73d094	Merge remote-tracking branch 'origin/dev_ic_v2' into develop	4 years ago
yinzuomei	7f604ce4ad	服务措施列表查询bugfix	4 years ago
yinzuomei	6185d0bb72	bugfix	4 years ago
zhaoqifeng	884ef28507	社区党建数据分析-党员相关	4 years ago
zxc	2536b86b3f	格式调整	4 years ago
zxc	e331619802	字段补全	4 years ago
zxc	200d2849c8	微调	4 years ago
zxc	48e64d6161	添加分类名	4 years ago
wangxianzhang	b2bdd88e07	Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data	4 years ago
wangxianzhang	60c455b39a	修改： 志愿者措施清单	4 years ago
jianjun	340ade9464	Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into develop	4 years ago
jianjun	02012fd901	初始化预警和分类配置图标	4 years ago
sunyuchao	98662c6917	Merge branch 'dev_ic_data' into develop	4 years ago
sunyuchao	8a75815338	代码调整	4 years ago
zxc	a04c7a2993	微调代码	4 years ago
zxc	e6225bc0eb	sql	4 years ago
zxc	46ce977e73	emm	4 years ago
yinzuomei	81eb531d19	Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data	4 years ago
yinzuomei	6ebbda301c	Merge remote-tracking branch 'origin/dev_ic_v2' into develop	4 years ago
yinzuomei	af27db247a	selectItemList	4 years ago