Tree: fe82ff2d56

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
jianjun	0fbb925b63	Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java	4 years ago
wangxianzhang	7b61020ac6	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
zxc	ffc4089b3c	Merge remote-tracking branch 'origin/dev_optimize' into develop	4 years ago
zxc	4a70fab897	房屋导入	4 years ago
jianjun	15bfc86987	添加公司私服地址 及发布配置	4 years ago
jianjun	22a23c7b99	Merge remote-tracking branch 'origin/master'	4 years ago
jianjun	a7421195f3	Merge remote-tracking branch 'remotes/origin/dev'	4 years ago
jianjun	4b1f3633b3	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
jianjun	09f8f47bb3	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	5509da011a	错误信息	4 years ago
jianjun	724e6fc2eb	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java	4 years ago
jianjun	46ab9a9959	Merge branch 'dev_bugfix_ljj' 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/constant/ImportErrorMsgConstants.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java	4 years ago
jianjun	9a2e8b31f8	修改单元数bug	4 years ago
zhaoqifeng	116555cb81	Merge branch 'dev'	4 years ago
zhaoqifeng	9099476b61	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
sunyuchao	449a0126a8	Merge branch 'dev_optimize' into develop	4 years ago
sunyuchao	87815a3c75	Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize	4 years ago
sunyuchao	88aa2df22a	改来改去	4 years ago
yinzuomei	de85447fc6	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
yinzuomei	20f4b9290e	Merge remote-tracking branch 'origin/dev_optimize' into develop	4 years ago
yinzuomei	973358befb	2行程上报	4 years ago
yinzuomei	59635d54ee	有重点区域行程	4 years ago
zhaoqifeng	1de6847b6e	Merge branch 'dev_bugfix_ljj' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java	4 years ago
zhaoqifeng	a20562d78b	楼栋编辑单元数时，从头开始新增单元，如果原先已存在，则略过	4 years ago
yinzuomei	9cc4a61449	Merge remote-tracking branch 'origin/dev_optimize' into develop	4 years ago
yinzuomei	da43e67353	Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize	4 years ago
yinzuomei	555bd39d1a	有重点区域行程	4 years ago
jianjun	77624199ac	Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize	4 years ago
jianjun	b50690c8cd	注解没用	4 years ago
yinzuomei	940362e712	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
yinzuomei	e12a07e921	Merge remote-tracking branch 'origin/dev_optimize' into develop	4 years ago
yinzuomei	d36dc41c8a	feign引用了	4 years ago
jianjun	f422097208	Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	1c029afe8f	删除无用的	4 years ago
jianjun	2433ffe780	删除无用的	4 years ago
jianjun	4a392158e6	Merge remote-tracking branch 'remotes/origin/dev_optimize' into develop	4 years ago
jianjun	818ed7eaea	Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize	4 years ago
jianjun	768664bb95	房屋导出再次调整	4 years ago
zxc	3d029d9b14	Merge remote-tracking branch 'origin/dev'	4 years ago
zxc	d29939299b	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	23fecfa3a6	错误信息具体化	4 years ago
yinzuomei	bcf274d079	Merge remote-tracking branch 'origin/dev_optimize' into develop	4 years ago
yinzuomei	01cc1692ab	楼宇-》楼栋	4 years ago
jianjun	e69fe13947	删除无用代码	4 years ago
wangxianzhang	a3975b54e3	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	c5f17dc169	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud	4 years ago
wangxianzhang	5c91f43ab9	-	4 years ago
wangxianzhang	beb35718d8	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud	4 years ago
wangxianzhang	a3cfc504c1	居民信息导入：校验所有列的必填；只校验第一次出现的填了但系统中找不到的列	4 years ago
wangxianzhang	003fdeddaf	Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago