Tree: a0cce1cf7a

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'a0cce1cf7a'

${ noResults }

Commit Graph

17390 Commits (a0cce1cf7af08a610723856ce4cff329d42c2ee5)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	a0cce1cf7a	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop	4 years ago
zxc	1ac84de0ff	加了个ID	4 years ago
sunyuchao	3ff2184df2	Merge branch 'dev_ic_diaodong' into develop	4 years ago
sunyuchao	4bda9cc782	初始化居民变更记录和变更明细数据	4 years ago
yinzuomei	1b0741285d	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop	4 years ago
yinzuomei	ba8461dd33	-10修改	4 years ago
wangxianzhang	ca169ed443	Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong Conflicts: epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml	4 years ago
wangxianzhang	55df17060c	新增： 1.完成居民导入，主表的类别变更过滤	4 years ago
sunyuchao	e40b0ca92c	初始化居民变更记录和变更明细数据	4 years ago
yinzuomei	40f551ef63	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop	4 years ago
yinzuomei	3ffefcc6d4	Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong	4 years ago
yinzuomei	f339dd6bd9	type	4 years ago
wangxianzhang	75d2617f88	Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	d563ac9e31	fix	4 years ago
wangxianzhang	35e325d3af	Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	8553e469cb	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java	4 years ago
jianjun	ecf497bc45	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	49639d6d19	获取当前组织下的工作人员 组织/部门/网格下人员列表 【组织添加的工作人员】	4 years ago
jianjun	7ba2f4d99e	获取当前组织下的工作人员 组织/部门/网格下人员列表	4 years ago
wangxianzhang	2aab12f433	Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java	4 years ago
wangxianzhang	ecd1b062b6	fix: 社区查询修改导致房屋列表错误	4 years ago
yinzuomei	a271c2f4b5	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop # Conflicts: # epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java # epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java	4 years ago
yinzuomei	943f3530c5	类别分析，定时任务	4 years ago
yinzuomei	6cfe2b37e8	人员类别分析-3个数查询	4 years ago
wangxianzhang	7ea90a9747	Merge branch 'dev' into develop	4 years ago
wangxianzhang	dbe6ae2fb0	修改： 1.resi-home/resi-hall的hystrix最大线程个数	4 years ago
jianjun	052a3e64b2	Merge remote-tracking branch 'remotes/origin/dev_upgrade_mybatis_plus' into dev	4 years ago
yinzuomei	4e6ec478d0	人员类别分析列表	4 years ago
jianjun	573f4c03fc	Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	9db1ab0b60	数字社区单独部署 支持的定时任务 拆分2个任务	4 years ago
jianjun	bda1d1a0de	Merge branches 'develop' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	b8933cf8d3	Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	78f493cee9	数字社区单独部署 支持的定时任务 拆分2个任务	4 years ago
sunyuchao	f4c74f2454	Merge branch 'dev_ic_diaodong' into develop	4 years ago
sunyuchao	1319a1d65b	人员变更明细表增加pids字段	4 years ago
zxc	ba6e4d04c4	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop	4 years ago
zxc	415863852b	房屋名	4 years ago
jianjun	583b4087ec	Merge remote-tracking branch 'remotes/origin/dev_shibei_task' into develop	4 years ago
jianjun	7ecdff5382	数字社区单独部署 支持的定时任务	4 years ago
sunyuchao	bad85a2f01	Merge branch 'dev_ic_diaodong' into develop	4 years ago
yinzuomei	c6eecad585	Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong	4 years ago
yinzuomei	719b403d34	人员变更记录类别字典表：迁入，迁出，类别，新增	4 years ago
sunyuchao	e54149303e	人员变更记录	4 years ago
zxc	e6274f4a92	Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop	4 years ago
zxc	3cbb59cd91	房屋缓存	4 years ago
jianjun	398c946994	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
yinzuomei	5d8a38f04f	Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong	4 years ago
yinzuomei	af777cb478	网格人员类别分析	4 years ago
jianjun	a9f40e8434	Merge branch 'dev_py_gridmember' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	bcd20d0148	获取网格内工作人员 去掉客户id	4 years ago