Tree: 3bae58d08a

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3bae58d08a'

${ noResults }

Commit Graph

18017 Commits (3bae58d08ad66a16b08b34c0ebbfc8277097836a)

 

All Branches   

Search

Author	SHA1	Message	Date
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
jianjun	dfc0d4f193	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	cef7095969	Merge remote-tracking branch 'origin/dev_yushan' into dev	4 years ago
yinzuomei	9304fe2871	/epmetuser/patrolroutinework/add修改	4 years ago
jianjun	a5b7e0e5e3	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	fa74f114b1	例行工作次数 导出	4 years ago
jianjun	6a8fd02825	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	229ae8ac42	bug改一下 例行工作次数 匹配不到	4 years ago
jianjun	d62b5b13a5	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	841c60dc60	项目变动粒度缩小为projectId	4 years ago
wangxianzhang	2d2969f08c	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
wangxianzhang	633deba5c3	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	79f4a9ea5f	修复： - 居民导入：附加信息表中，判断是否为新增用户的逻辑错误	4 years ago
yinzuomei	e4653e1d8f	冲突	4 years ago
yinzuomei	dd31f2aadd	Merge branches 'dev' and 'dev_yushan' of http://121.42.41.42:7070/r/epmet-cloud into dev_yushan Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java	4 years ago
sunyuchao	e4d67b967b	Merge branch 'dev_routine_work_syc' into dev	4 years ago