Tree: 87f5dfeba8

dev

dev_shibei_match

feature/teamB_zz_wgh

master

release

2021_0831_2159_before_pinginpush_mergeinto

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '87f5dfeba8'

${ noResults }

Commit Graph

22344 Commits (87f5dfeba8a8d2f9b70468b4e8252d6eb5a516bd)

 

All Branches   

Search

Author	SHA1	Message	Date
Jackwang	ebfaf8b808	添加补充状态	4 years ago
jianjun	64e2f6e195	Merge remote-tracking branch 'remotes/origin/dev' into dev_house_resi_export	4 years ago
jianjun	f13582b5aa	导出一户一档 暂存	4 years ago
yinzuomei	4a5cc131de	变更记录返参增加reason	4 years ago
yinzuomei	80c1a06039	原来的变动，只有迁入到其他ic_resi_user.status='1'；subStatus='11';入参增加reason.	4 years ago
yinzuomei	5776367a2a	IcResiUserSubStatusEnum，新增01，导入02	4 years ago
yinzuomei	fa9c3e1747	SQL脚本	4 years ago
sunyuchao	57e59417cb	迁入管理 代码生成	4 years ago
zxc	84eae58ab0	字段修改	4 years ago
Jackwang	743ab8e307	迁出、福利、死亡人员相关	4 years ago
wangxianzhang	216fb26c86	居民信息模板变更。"居民基本信息录入表"sheet中的备注，挪动到了"基础信息"下	4 years ago
zxc	cd09ae214a	Merge branch 'dev_resi_export' into dev	4 years ago
zxc	b6e014f4a1	生成代码	4 years ago
zhangyuan	ee144b1b4a	增加身份证获取年龄的功能	4 years ago
YUJT	f1725cf22d	Merge branch 'dev' into shibei_hlpt_master	4 years ago
zhangyuan	914414347c	福利等相关dto	4 years ago
YUJT	db5dc52c25	新增居民端党员风采接口	4 years ago
yinzuomei	8f844d27a4	Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of	4 years ago
yinzuomei	1fec754035	注释一下	4 years ago
zxc	188eff0e56	楼栋导入新增修改楼栋类型	4 years ago
zxc	f49151d476	去除多余判断	4 years ago
zhangyuan	4fabb54fb9	冗余代码	4 years ago
zxc	601c85057c	sort default 0	4 years ago
zxc	1366c8e0ac	小区导入bug修复	4 years ago
zxc	75bd0eb8bb	房屋导入微调	4 years ago
jianjun	a1db4e9c58	Merge branch '市北测试' into 市北生产 # Conflicts: # epmet-module/epmet-heart/epmet-heart-server/pom.xml # epmet-module/gov-access/gov-access-server/pom.xml # epmet-module/gov-org/gov-org-server/pom.xml # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/pom.xml # 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	4 years ago
jianjun	a47f896a94	合并冲突解决	4 years ago
jianjun	e24b1865ce	Merge remote-tracking branch 'remotes/origin/dev' into 市北测试 # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml # epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml # epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml # epmet-module/epmet-heart/epmet-heart-server/pom.xml # epmet-module/gov-access/gov-access-server/pom.xml # epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml # epmet-module/gov-org/gov-org-server/pom.xml # epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/pom.xml # 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	4 years ago
jianjun	1f9e86293b	合并冲突解决	4 years ago
jianjun	119fafaec8	Merge branch '市北测试' into 市北生产 # Conflicts: # 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	4 years ago
jianjun	c8687b17ff	Merge remote-tracking branch 'remotes/origin/back' into 市北测试 # Conflicts: # 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	4 years ago
jianjun	91e329135b	合并冲突解决	4 years ago
jianjun	1ebfac5b71	合并冲突解决	4 years ago
jianjun	3a857c3753	合并冲突解决	4 years ago
jianjun	fd7d3c38ad	合并冲突解决	4 years ago
jianjun	95ac780ce6	合并冲突解决	4 years ago
jianjun	d05eb5cc48	Merge remote-tracking branch 'remotes/origin/dev' into 市北生产 # Conflicts: # epmet-admin/epmet-admin-server/pom.xml # epmet-gateway/pom.xml # epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml # epmet-module/data-aggregator/data-aggregator-server/pom.xml # epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml # epmet-module/data-statistical/data-statistical-server/pom.xml # epmet-module/epmet-common-service/common-service-server/pom.xml # epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml # epmet-module/epmet-heart/epmet-heart-server/pom.xml # epmet-module/epmet-job/epmet-job-server/pom.xml # epmet-module/epmet-oss/epmet-oss-server/pom.xml # epmet-module/epmet-third/epmet-third-server/pom.xml # epmet-module/gov-access/gov-access-server/pom.xml # epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml # epmet-module/gov-org/gov-org-server/pom.xml # epmet-module/gov-project/gov-project-server/pom.xml # epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml # epmet-module/oper-customize/oper-customize-server/pom.xml # epmet-module/resi-group/resi-group-server/pom.xml # epmet-module/resi-home/resi-home-server/pom.xml # epmet-module/resi-partymember/resi-partymember-server/pom.xml # epmet-openapi/epmet-openapi-scan/pom.xml # epmet-user/epmet-user-server/pom.xml	4 years ago
jianjun	866bf4217c	Merge branch 'release' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform into 市北生产 Conflicts: epmet-auth/deploy/docker-compose-prod.yml epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java epmet-gateway/deploy/docker-compose-prod.yml epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.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	4 years ago
jianjun	7ad42b1037	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into 市北测试 # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	4 years ago
jianjun	6736ef1f1f	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	4 years ago
zhaoqifeng	86023faa67	个人信息	4 years ago
jianjun	14cbe024d9	合并冲突解决	4 years ago
jianjun	5a151ab746	Merge remote-tracking branch 'remotes/origin/back' into dev # Conflicts: # 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	4 years ago
jianjun	e88a9f13f1	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev # Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java	4 years ago
yinzuomei	f9bbcb5605	修改房屋，删除房屋缓存	4 years ago
zhaoqifeng	1459a2b36d	房屋管理左侧树排序	4 years ago
zxc	3575b1f2f9	sort	4 years ago
zhaoqifeng	f9d4b2c406	房屋管理左侧树排序	4 years ago
yinzuomei	9a82f4a645	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	4 years ago
yinzuomei	747ba74425	listresi排序调整1	4 years ago