Tree: 0dd9de720e

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '0dd9de720e'

${ noResults }

Commit Graph

20706 Commits (0dd9de720e55cf215ebbb169499ee35d0551c9a8)

 

All Branches   

Search

Author	SHA1	Message	Date
sunyuchao	c3501ec3f0	Merge branch 'dev_resi_export' into develop	4 years ago
sunyuchao	d1f3d208c9	bug修改，增加同组织下模板名不能重复校验	4 years ago
jianjun	d2f583f1ee	代码微调	4 years ago
jianjun	4caebaf21c	代码微调	4 years ago
zxc	7ec121058a	Merge branch 'dev_import_edit' into develop	4 years ago
zxc	6957c75b66	小区导入	4 years ago
zxc	437a160b21	Merge branch 'dev_resi_export' into develop	4 years ago
zxc	40d6c23b75	排序修改	4 years ago
zhangyuan	30f7486688	Merge branch 'dev_contract' into develop	4 years ago
zhangyuan	94b17f2240	bug，entity没有改字段	4 years ago
zhangyuan	e49c1531c0	Merge branch 'dev_contract' into develop	4 years ago
zhangyuan	86bbbc346a	改一下存储头像写法	4 years ago
zxc	f88deb8240	Merge branch 'dev_resi_export' into develop	4 years ago
zxc	495fbc3336	排序修改	4 years ago
zxc	0b92febc3e	Merge remote-tracking branch 'origin/dev_resi_export' into develop	4 years ago
zxc	ce76dd0bb5	排序修改	4 years ago
zhaoqifeng	463bd0862a	Merge branch 'dev_resi_export' into develop	4 years ago
jianjun	050d67deda	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	a84822f745	添加注释	4 years ago
zhaoqifeng	0ff35b0a2a	自定义导出模板列表及模板详情	4 years ago
zhangyuan	701bd81998	Merge branch 'dev_contract' into develop	4 years ago
zhangyuan	c8fc5881b4	增加根据身份证查询人员的接口	4 years ago
jianjun	c1274e2423	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
jianjun	94c816662e	获取子节点	4 years ago
zxc	e0de7db9b8	Merge remote-tracking branch 'origin/dev_resi_export' into develop	4 years ago
zxc	6f5dae4a38	关注名单详情	4 years ago
sunyuchao	f38d2c8e65	Merge branch 'dev_resi_export' into develop	4 years ago
jianjun	75a99e42ea	生成id	4 years ago
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