Tree: f8f28b8e70

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'f8f28b8e70'

${ noResults }

Commit Graph

22008 Commits (f8f28b8e70c6fb4e27f6f751f8548af585c3b79c)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	d19cca0057	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import_edit Conflicts: epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
jianjun	4781261843	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	e2721549c7	返回	3 years ago
zxc	7a2ff5af56	暂提	3 years ago
jianjun	c90449d3f8	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	6e394764f4	排序	3 years ago
jianjun	3e25d5143c	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	3 years ago
jianjun	02c90dc8df	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	3 years ago
jianjun	bf108f35b6	没删干净	3 years ago
zxc	dd301aabdf	小区导入修改	3 years ago
zhangyuan	fbbbc9728c	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	8ba08e1bf9	校验方式错误修改	3 years ago
jianjun	0fe7b398d6	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	35e596da96	自定义导出脚本	3 years ago
zhangyuan	9fc8849252	Merge branch 'develop' of http://121.42.41.42:7070/r/epmet-cloud into develop	3 years ago
zhangyuan	d27f880c0c	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	c5c42796a9	bug	3 years ago
jianjun	5a1d3cbfd6	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
jianjun	d08fc95fdb	删掉字段	3 years ago
wangxianzhang	931859fa2e	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	3 years ago
wangxianzhang	a6acb2f0c4	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
wangxianzhang	bbe4f2f25e	居民信息导出，增加"是否办理公益性岗位"	3 years ago
jianjun	abaacb9981	兼容老模板	3 years ago
zhangyuan	775fd5dd39	Merge branch 'dev_contract' into develop # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
zhangyuan	94ae64af3c	修改查询的方式	3 years ago
jianjun	0202dfe555	固定表头	3 years ago
zxc	bf242d650d	Merge branch 'dev' 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/dao/IcHouseDao.java epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml	3 years ago
jianjun	6dd2c63b8f	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	77c2ce8518	需求类别处理	3 years ago
jianjun	fc100ac5c7	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	3 years ago
jianjun	f18e54725c	feign错误	3 years ago
jianjun	615bd71688	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	ff2d8a7f66	位置移动	3 years ago
jianjun	5ca5f931a4	添加注释等	3 years ago
jianjun	9199d321e3	添加注释等	3 years ago
jianjun	a47ee45f94	自定义导出处理需求的item值	3 years ago
yinzuomei	e764119bad	Merge remote-tracking branch 'origin/dev_resi_export' into develop # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
yinzuomei	3beb0d7839	居民信息列表需求分类展示一级分类名称，去重	3 years ago
zhangyuan	bac4b9d4c7	Merge branch 'dev_contract' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
yinzuomei	2f5701c220	icneighborhood/open/list	3 years ago
yinzuomei	943000ff25	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java	3 years ago
zhangyuan	f3f342137e	Merge branch 'dev_contract' into dev	3 years ago
zhangyuan	0e425a33a8	增加插入用户以及头像等的逻辑	3 years ago
yinzuomei	ebf188acb7	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java	3 years ago
yinzuomei	2f12980ec9	icneighborhood/open/list	3 years ago
jianjun	28e39dcf13	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	9b6b42a5db	自定义导出 合并单元格2	3 years ago
jianjun	1f8b9c9c39	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
zhaoqifeng	e744fe3457	Merge remote-tracking branch 'origin/develop' into develop	3 years ago
zhaoqifeng	f8a33bca0b	Merge branch 'dev_resi_export' into develop	3 years ago