Tree: 04f6fc197c

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '04f6fc197c'

${ noResults }

Commit Graph

18099 Commits (04f6fc197cb5056c2b38d989700220cc64d77d47)

 

All Branches   

Search

Author	SHA1	Message	Date
wangxianzhang	04f6fc197c	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
zhaoqifeng	3256f76f32	居民端活动详情	4 years ago
zxc	170ad7426f	名字	4 years ago
zhaoqifeng	d039e04e8f	联建活动旧数据处理脚本	4 years ago
sunyuchao	23cbac8d61	Merge remote-tracking branch 'origin/dev_import' into dev_import	4 years ago
sunyuchao	a33160a77d	社会自组织导入 必要列设置不能为空	4 years ago
zhaoqifeng	0c14dfeeca	联建活动旧数据处理脚本	4 years ago
wangxianzhang	4d60c82906	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
wangxianzhang	fbedcc1ad0	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import	4 years ago
wangxianzhang	fa473bb10c	修改： 【居民信息导入】模板变更。bug修复	4 years ago
sunyuchao	152615b796	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	180bc56d08	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
sunyuchao	b76de2b345	Merge branch 'dev_import' into develop	4 years ago
zxc	9964ccfcfe	Merge remote-tracking branch 'origin/dev_delete' into develop	4 years ago
zxc	e6f1298f4e	顿号改逗号	4 years ago
sunyuchao	4e22972fe4	导入程序调整	4 years ago
zxc	39803b60bf	Merge remote-tracking branch 'origin/dev_delete' into develop	4 years ago
zxc	49cde60fb0	del	4 years ago
zxc	42555a8476	Merge remote-tracking branch 'origin/dev_delete' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java # epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java	4 years ago
zxc	391b37ed9d	del	4 years ago
zxc	5d9534da94	error code	4 years ago
wangxianzhang	e5a354a4f5	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import Conflicts: epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml	4 years ago
wangxianzhang	993b303b17	Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	e16f28f121	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	b40a783690	Merge remote-tracking branch 'remotes/origin/develop' into release_temp	4 years ago
jianjun	5c11d4f5c7	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	62400810f1	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	848f82f3d6	验证码改为纯小写字母	4 years ago
jianjun	94ec1cceb9	stats 去掉线程池定义 直接使用服务定义的线程池	4 years ago
wangxianzhang	6be9bb11ea	Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
jianjun	5128a9202b	调整日志位置	4 years ago
wangxianzhang	a95d79e4f8	Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	c3cef2d4fb	修改日志级别	4 years ago
wangxianzhang	1f248dc02e	修改： common-tools增加通用线程池配置类 每个服务增加线程池配置xml和yml	4 years ago
wangxianzhang	37d4607146	Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	4 years ago
wangxianzhang	09075d3a4b	Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	ab25971c09	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
jianjun	5acdfa9463	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
wangxianzhang	36f7f9471d	修改： 1.ResultDataResolver中的逻辑	4 years ago
jianjun	1950214b1d	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
jianjun	23872c9682	指标计算方法调用 挪到原始数据抽取完后计算	4 years ago
sunyuchao	7e583aa655	Merge branch 'develop' into release_temp	4 years ago
sunyuchao	d16debdab7	Merge branch 'dev_import' into develop	4 years ago
sunyuchao	89229c53a6	导入调整	4 years ago
zxc	944702a47b	添加状态	4 years ago
zxc	69b3cf205c	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	f671b8ae52	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	c09981c3e4	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	3e770e9a15	排除报事	4 years ago
sunyuchao	bfd990fb56	Merge branch 'dev_bugfix_ljj' into dev	4 years ago