Tree: ca9e3c07b1

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'ca9e3c07b1'

${ noResults }

Commit Graph

18032 Commits (ca9e3c07b10f24fb805942e94e54d4af95ff13ce)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	bac2851b48	添加返回结果	4 years ago
zhaoqifeng	d6bef6ed45	Merge branch 'dev_import' into develop	4 years ago
zhaoqifeng	ac62f98118	联建活动关联多个单位和服务事项	4 years ago
jianjun	0772fc34ca	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	b3677b3ab0	巡查间隔20s	4 years ago
zhaoqifeng	36f323307b	Merge branch 'dev_import' into develop	4 years ago
sunyuchao	8f450f696a	Merge remote-tracking branch 'origin/dev_import' into dev_import	4 years ago
sunyuchao	f4f9cdabbd	漏提文件	4 years ago
zhaoqifeng	f041d66f7f	Merge branch 'dev_import' into develop	4 years ago
zhaoqifeng	ac8f0ef67c	联建活动关联多个单位和服务事项	4 years ago
sunyuchao	a974621a40	党员风采、社会自组织导入程序调整	4 years ago
zxc	3dfd00db2b	errorInfo宽度调整	4 years ago
zxc	d49b365e50	errorInfo	4 years ago
zxc	c2f6067060	errorInfo	4 years ago
wangxianzhang	3ef2d6f51f	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	f096da0968	Merge remote-tracking branch 'origin/dev_import' into dev_import # Conflicts: # epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java	4 years ago
wangxianzhang	c65e42672f	修改： 1.导入任务记录-创建接口-新增originFileName 原始文件名参数	4 years ago
jianjun	5e116d0294	Merge remote-tracking branch 'origin/dev_import' into dev_import	4 years ago
jianjun	aee550a064	导入记录分页查询	4 years ago
zxc	d9cbe10fed	Merge remote-tracking branch 'origin/dev' into dev_import	4 years ago
jianjun	17e604af3d	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	750c2cf50c	去掉修改	4 years ago
zxc	19a992d58c	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import	4 years ago
zxc	76877714ac	errorInfo	4 years ago
jianjun	45c91b6786	Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into dev	4 years ago
zhaoqifeng	d9f0e71e90	联建活动关联多个单位和服务事项	4 years ago
wangxianzhang	7268b489e2	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	f471e3348a	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import	4 years ago
wangxianzhang	1508e03ba6	新增： 1.oss接受导入任务描述文件的接口 修改： 1.居民信息导入，生成excel文件，传送到oss，而不再下载	4 years ago
zhaoqifeng	2888475ff7	联建活动关联多个单位和服务事项	4 years ago
zxc	ee66d95386	常量添加	4 years ago
zxc	3d13549a8a	errInfos	4 years ago
wangxianzhang	1b8bb462ce	Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	5f277ece78	Merge remote-tracking branch 'origin/dev_import' into dev_import	4 years ago
wangxianzhang	75467a89d8	新增： 1.commonservice中导入任务相关的接口 修改： 1.居民信息导入中调用commonservice中的	4 years ago
wangxianzhang	cf5645e322	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	6230c5dc49	微调	4 years ago
yinzuomei	1c66b86c52	Merge remote-tracking branch 'origin/dev_import' into develop	4 years ago
yinzuomei	b5d6ec8bd4	组织网格增加centerAddress中心点位地址	4 years ago
yinzuomei	290022b45d	Merge remote-tracking branch 'origin/dev_import' into develop	4 years ago
yinzuomei	462cbfe6b7	/gov/org/agency/addagency-v2新增组织，增加中心点位	4 years ago
yinzuomei	de74af16c5	/gov/org/agency/editagency修改组织，增加中心点位	4 years ago
yinzuomei	1282927f0f	/gov/org/grid/editgrid修改网格，增加中心点位	4 years ago
wangxianzhang	0da1035fea	修复： 1.居民导入：options缓存问题	4 years ago
yinzuomei	e554f39c5c	/gov/org/grid/addgrid新增网格，增加中心点位	4 years ago
yinzuomei	17b3cc3ccd	Merge remote-tracking branch 'origin/dev_yushan' into develop	4 years ago
yinzuomei	680783967d	代码冲突	4 years ago
yinzuomei	ff9015baf6	Merge remote-tracking branch 'origin/dev_import' into develop # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java	4 years ago
yinzuomei	e247d78303	删除社会组织字典	4 years ago
yinzuomei	880f21c9b4	sys/dict/data/dictlist限制sys_dict_data.del_flag='0'	4 years ago