Tree: 174bde7004

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '174bde7004'

${ noResults }

Commit Graph

13307 Commits (174bde700421e07f7ef0a46b54707e3ff24a66cb)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	174bde7004	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	0a69058618	Merge branch 'dev_add_closedCount_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	64698b1ebb	删除测试参数	4 years ago
wangxianzhang	decde9f009	Merge branch 'dev_ic_platform' into develop	4 years ago
jianjun	89a29eb4f2	Revert "合并问题" This reverts commit 08a358dd	4 years ago
jianjun	b0816517b1	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	08a358dd71	合并问题	4 years ago
wangxianzhang	56ab29a97d	Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform	4 years ago
zxc	7eec94a97a	去除多余	4 years ago
wangxianzhang	3ea4aac18c	修改： icform/items增加redis缓存	4 years ago
zxc	266c971a96	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	e975ac29ee	项目数	4 years ago
zxc	6f3f462587	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	5041656101	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_add_closedCount_category	4 years ago
zxc	eae981d109	mingzi	4 years ago
jianjun	2d6d0e0b85	项目列表导出	4 years ago
zxc	e1e31c5a6f	个人数据	4 years ago
zxc	dbd38be21e	Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop	4 years ago
zxc	ba7c4b1410	添加父级parentCode	4 years ago
zxc	2bbecd1005	新增返回字段	4 years ago
wangxianzhang	74cc2e3f48	Merge branch 'dev_ic_platform' into develop	4 years ago
wangxianzhang	816a08c9e6	修改： 1.已存在的ic居民相关信息，修改，而不跳过	4 years ago
zhaoqifeng	3eb2d28cc1	【基础信息】搜索人名	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