Tree: 828c1ec4d4

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '828c1ec4d4'

${ noResults }

Commit Graph

20528 Commits (828c1ec4d4ba43f92688f5a3e424db549622a7a9)

 

All Branches   

Search

Author	SHA1	Message	Date
sunyuchao	4870264524	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java	4 years ago
sunyuchao	83862a09d8	疫苗接种情况增加详情接口	4 years ago
zhangyuan	9232d85b75	Merge branch 'dev_contract' into develop # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	4 years ago
zhangyuan	8218e6381e	更新更新人员头像的dto	4 years ago
jianjun	9b7ffa740b	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	61315feeb4	删除多余的方法	4 years ago
zxc	eca5abdb21	删除合并多余	4 years ago
zxc	b710365cee	Merge remote-tracking branch 'origin/dev_import_edit' 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/impl/IcResiUserServiceImpl.java	4 years ago
jianjun	c7672f0f6d	提高可读性	4 years ago
zxc	cf051cbdb1	楼栋导入修改	4 years ago
yinzuomei	5bc6200870	Merge remote-tracking branch 'origin/dev_resi_export' into develop	4 years ago
yinzuomei	927d60e542	/statsresiwarn/alluserwarnlist ***	4 years ago
jianjun	921d0a6188	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	adc92ef7c0	简化导出的dto	4 years ago
jianjun	1b4ccd2d73	简化导出的dto	4 years ago
jianjun	7485446bd2	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	6636f77a0c	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	913e9b8a45	添加type	4 years ago
zhaoqifeng	60f7a6e971	房屋信息修改	4 years ago
zxc	2d6e682c10	暂提	4 years ago
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	4 years ago
jianjun	4781261843	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	e2721549c7	返回	4 years ago
zxc	7a2ff5af56	暂提	4 years ago
jianjun	c90449d3f8	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	6e394764f4	排序	4 years ago
jianjun	3e25d5143c	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	02c90dc8df	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	bf108f35b6	没删干净	4 years ago
zxc	dd301aabdf	小区导入修改	4 years ago
zhangyuan	fbbbc9728c	Merge branch 'dev_contract' into develop	4 years ago
zhangyuan	8ba08e1bf9	校验方式错误修改	4 years ago
jianjun	0fe7b398d6	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	35e596da96	自定义导出脚本	4 years ago
zhangyuan	9fc8849252	Merge branch 'develop' of http://121.42.41.42:7070/r/epmet-cloud into develop	4 years ago
zhangyuan	d27f880c0c	Merge branch 'dev_contract' into develop	4 years ago
zhangyuan	c5c42796a9	bug	4 years ago
jianjun	5a1d3cbfd6	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	d08fc95fdb	删掉字段	4 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	4 years ago
wangxianzhang	a6acb2f0c4	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
wangxianzhang	bbe4f2f25e	居民信息导出，增加"是否办理公益性岗位"	4 years ago
jianjun	abaacb9981	兼容老模板	4 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	4 years ago
zhangyuan	94ae64af3c	修改查询的方式	4 years ago
jianjun	0202dfe555	固定表头	4 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	4 years ago
jianjun	6dd2c63b8f	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	4 years ago
jianjun	77c2ce8518	需求类别处理	4 years ago
jianjun	fc100ac5c7	Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago