Tree: 4ef64f00c9

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '4ef64f00c9'

${ noResults }

Commit Graph

17994 Commits (4ef64f00c9b4dcaf2ec24c8e30d1d6e8bd344d7e)

 

All Branches   

Search

Author	SHA1	Message	Date
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	41ff03a87c	Merge branch 'release_temp' of http://121.42.41.42:7070/r/epmet-cloud into release_temp	4 years ago
yinzuomei	5cbc00fbb1	Merge remote-tracking branch 'origin/develop' into release_temp	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	1d6021a08e	Merge remote-tracking branch 'origin/release_temp' into release_temp	4 years ago
jianjun	d898422835	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	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	96a6a84060	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp	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
zxc	f8de040cc5	Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev	4 years ago
zxc	d1189d2e96	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	3399550de4	Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop	4 years ago
zxc	f728fd9a1a	修复	4 years ago
zxc	1b013e2434	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
zxc	063e1974a2	Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop	4 years ago
zxc	1aec70b44c	显示	4 years ago
zxc	2dc95d6b38	bug	4 years ago
jianjun	725b0ed4d3	更新时间	4 years ago
jianjun	73efe42f6b	更新下日志	4 years ago
jianjun	a443418048	更新吧 少年	4 years ago
jianjun	e82142c941	改bug	4 years ago
jianjun	77452add38	改bug	4 years ago
jianjun	dcbb53dd66	弄个日志上去 up	4 years ago
jianjun	c778eb6238	弄个日志上去	4 years ago