Tree: 64c21c1399

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '64c21c1399'

${ noResults }

Commit Graph

13533 Commits (64c21c1399ee18a85b7b781ba22231ae67a60129)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	64c21c1399	Merge remote-tracking branch 'remotes/origin/develop' into release_temp	4 years ago
jianjun	89e85477cb	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	07a305659a	Merge branch 'dev_ic_platform' 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/govorg/GovOrgService.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java	4 years ago
jianjun	aeb0c4511a	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
jianjun	7bf2cdefd4	所属支部固定处理 代调整	4 years ago
zxc	9e3faebf7c	个人数据	4 years ago
zxc	cf009d463a	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_ic_platform # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	4 years ago
zxc	11f2a62cfd	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
zxc	e2fd041179	查询志愿者类别	4 years ago
jianjun	21b10762f4	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java	4 years ago
zxc	a3bf43d09b	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	0b01cbd914	位置调换	4 years ago
wangxianzhang	66feecd005	Merge branch 'dev_ic_platform' into develop	4 years ago
wangxianzhang	d1a1470997	调整url	4 years ago
wangxianzhang	a545c0a0fe	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform	4 years ago
wangxianzhang	3f34a5b7ac	完成居民导入	4 years ago
lzh	d94da9418a	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform	4 years ago
lzh	76de3478bb	居民类别配置	4 years ago
wangxianzhang	4411631649	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform	4 years ago
wangxianzhang	0cfcd83787	修改: 完成居民导入错误信息和跳过信息的收集 完成附加信息导入后对主表信息的修改	4 years ago
zxc	cbc77998cf	emm	4 years ago
jianjun	86b30db268	导出项目分类	4 years ago
zxc	004a6a0e96	经纬度	4 years ago
zhaoqifeng	d9a23bc205	【基础信息】家庭 查询房屋	4 years ago
zxc	b82d137150	weishu	4 years ago
zxc	a1b72b965a	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	5b1ebfaf70	ziduank	4 years ago
zxc	f1b791d246	修改children	4 years ago
zxc	9597bc4e9f	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	9066fd45d8	emm	4 years ago
zxc	f6dbe5dba4	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	1e30a72cac	项目列表	4 years ago
zxc	80c9bf9f55	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	4 years ago
zxc	3a07521d40	查询组织网格信息	4 years ago
zxc	69e0e11c36	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_add_closedCount_category	4 years ago
zxc	ae93f390bd	项目	4 years ago
jianjun	395ed3adf8	删除多余的方法	4 years ago
jianjun	ef484d6af8	删除多余的方法	4 years ago
jianjun	908e6a496a	Merge remote-tracking branch 'remotes/origin/dev_add_closedCount_category' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	4 years ago
jianjun	b2f40e8ad9	获取组织和网格树 网格加到组织里面 平级	4 years ago
yinzuomei	6caa092c4c	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
yinzuomei	20a9eef1e4	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
yinzuomei	f83ee0bb46	删除方法被删，还原	4 years ago
yinzuomei	7e53dd90eb	Merge remote-tracking branch 'origin/develop' into release_temp	4 years ago
yinzuomei	ebd7be79e8	Merge remote-tracking branch 'origin/dev_ic_platform' into develop	4 years ago
yinzuomei	5353ce8fb2	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
yinzuomei	5ea973af03	getcustomerform调整	4 years ago
jianjun	9920de9cb3	Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev_add_closedCount_category	4 years ago
zhaoqifeng	3d71a6f033	个人信息-家庭关系	4 years ago
lzh	c1d91e9dc5	Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform	4 years ago