Tree: fe82ff2d56

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fe82ff2d56'

${ noResults }

Commit Graph

20825 Commits (fe82ff2d56fc076ecc2e8b7fd072d68463d3db6c)

 

All Branches   

Search

Author	SHA1	Message	Date
zhangyuan	b63e4c1c21	Merge branch 'dev'	3 years ago
zhangyuan	8d01bec297	Merge branch 'develop' into dev	3 years ago
zhangyuan	73d8eb4664	bug	3 years ago
zhangyuan	fee3e5cfae	Merge branch 'dev' # Conflicts: # 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
zhangyuan	1f13a4a13b	Merge branch 'dev_contract' into dev	3 years ago
jianjun	8cb6a23b64	微调	3 years ago
jianjun	1f944cf58f	Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # 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
jianjun	ae949b6adc	Merge remote-tracking branch 'remotes/origin/dev_resi_export' 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/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	429cf2841e	Merge remote-tracking branch 'remotes/origin/dev' into dev_resi_export # 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/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
zhaoqifeng	538d97d87d	Merge branch 'dev_bugfix_ljj' into dev	3 years ago
jianjun	e6017c4465	这个代码被删除了 恢复	3 years ago
zhaoqifeng	45267e787c	Merge branch 'dev_bugfix_ljj' into develop	3 years ago
zhaoqifeng	022c7acba3	list转map key重复	3 years ago
jianjun	25cea0f695	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	edfe9b063c	导出返回错误信息 2	3 years ago
jianjun	8a137c95d1	Merge remote-tracking branch 'origin/develop' into develop	3 years ago
jianjun	bba26ecfd6	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	dbf7001c1b	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
jianjun	e387fca7de	导出返回错误信息	3 years ago
sunyuchao	c3501ec3f0	Merge branch 'dev_resi_export' into develop	3 years ago
sunyuchao	d1f3d208c9	bug修改，增加同组织下模板名不能重复校验	3 years ago
jianjun	d2f583f1ee	代码微调	3 years ago
jianjun	4caebaf21c	代码微调	3 years ago
zxc	7ec121058a	Merge branch 'dev_import_edit' into develop	3 years ago
zxc	6957c75b66	小区导入	3 years ago
zxc	437a160b21	Merge branch 'dev_resi_export' into develop	3 years ago
zxc	40d6c23b75	排序修改	3 years ago
zhangyuan	30f7486688	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	94b17f2240	bug，entity没有改字段	3 years ago
zhangyuan	e49c1531c0	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	86bbbc346a	改一下存储头像写法	3 years ago
zxc	f88deb8240	Merge branch 'dev_resi_export' into develop	3 years ago
zxc	495fbc3336	排序修改	3 years ago
zxc	0b92febc3e	Merge remote-tracking branch 'origin/dev_resi_export' into develop	3 years ago
zxc	ce76dd0bb5	排序修改	3 years ago
zhaoqifeng	463bd0862a	Merge branch 'dev_resi_export' into develop	3 years ago
jianjun	050d67deda	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
jianjun	a84822f745	添加注释	3 years ago
zhaoqifeng	0ff35b0a2a	自定义导出模板列表及模板详情	3 years ago
zhangyuan	701bd81998	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	c8fc5881b4	增加根据身份证查询人员的接口	3 years ago
jianjun	c1274e2423	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
jianjun	94c816662e	获取子节点	3 years ago
zxc	e0de7db9b8	Merge remote-tracking branch 'origin/dev_resi_export' into develop	3 years ago
zxc	6f5dae4a38	关注名单详情	3 years ago
sunyuchao	f38d2c8e65	Merge branch 'dev_resi_export' into develop	3 years ago
jianjun	75a99e42ea	生成id	3 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	3 years ago
sunyuchao	83862a09d8	疫苗接种情况增加详情接口	3 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	3 years ago