Tree: e134aa33f7

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e134aa33f7'

${ noResults }

Commit Graph

17644 Commits (e134aa33f7b3802e6bcc5a927447ae23163f28b5)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	e134aa33f7	Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java	4 years ago
zxc	62531ac5b5	build	4 years ago
zxc	f6db2496d9	暂提	4 years ago
zxc	21b453c87e	emm 合并	4 years ago
zhaoqifeng	12248915d1	获取小区，楼栋，单元ID	4 years ago
zxc	07b6b00603	gailegeming	4 years ago
zxc	5061020e4c	暂提	4 years ago
wangxianzhang	f605121edb	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
zxc	969ef28f61	楼栋导入	4 years ago
wangxianzhang	df4b0c9c9b	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	e41cf5a506	- 优化居民导入 - 优化日志切面打印，增加对MultipartFile类型的过滤	4 years ago
zxc	634c5d5927	楼栋存在状态添加	4 years ago
zxc	8c5a856d2b	楼栋存在状态添加	4 years ago
zxc	f1ca1029e8	dto改改名	4 years ago
zxc	1c803ebc4f	Merge branch 'dev_addcate_and_import' into develop # Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java	4 years ago
zxc	39b4f7c1ad	房屋导入	4 years ago
zxc	dcf517d774	房屋导入暂提	4 years ago
wangxianzhang	17c7264d82	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_resiimport_optimize	4 years ago
wangxianzhang	018c49264f	调整开发环境jvm内存参数	4 years ago
wangxianzhang	0a0f7b3367	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java	4 years ago
zhaoqifeng	a9c5cb4987	获取小区，楼栋，单元ID	4 years ago
wangxianzhang	f7c5e8ceb6	修改： 1.居民信息导入：将类别变更数据放到redis中，减少内存占用	4 years ago
zhaoqifeng	85eed0ca99	获取小区，楼栋，单元ID	4 years ago
sunyuchao	346b5dcdf7	Merge branch 'dev_grid_lively_syc' into dev	4 years ago
zxc	d51f3f1fa8	房屋导入暂提	4 years ago
sunyuchao	26936e18b1	网格员数据上报接口上传的数据pids是从三个街道开始的，需要在前边拼上平阴县的组织id才可以	4 years ago
yinzuomei	60659f66fc	Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop	4 years ago
yinzuomei	a5db5669c0	党员风采列表倒序	4 years ago
zxc	1414888249	注释	4 years ago
zhaoqifeng	be3c7dc372	添加参数	4 years ago
zxc	38397a605a	房屋导入暂提	4 years ago
zxc	11ff0e4433	id类型	4 years ago
zxc	c554be8b0b	房屋导入暂提	4 years ago
yinzuomei	888419fe1e	dynamicQuery	4 years ago
zxc	413af387af	fangwuID	4 years ago
zxc	a03ca03f47	房屋ID	4 years ago
zxc	55ba9b5b71	emm	4 years ago
zxc	afbfb6cbf5	房屋导入通用DTO	4 years ago
zhaoqifeng	20b5defc53	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
zhaoqifeng	c082ebafe4	获取项目节点耗时信息SQL改造	4 years ago
wangxianzhang	799a4e2b02	Merge branch 'wxz_resiimport_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	4922ee5707	修改： 1.居民信息导入：将数据分多批次导入，减少内存占用	4 years ago
jianjun	444c837fdc	9999替换为统一错误码	4 years ago
zxc	f9ef9e267e	房屋信息导入	4 years ago
sunyuchao	57e040415b	Merge branch 'dev_grid_lively_syc' into dev	4 years ago
sunyuchao	b3432601c3	程序优化	4 years ago
yinzuomei	fa0058664b	导入去掉图片	4 years ago
sunyuchao	f50aa552b9	Merge branch 'dev_grid_lively_syc' into dev	4 years ago
sunyuchao	c946e16237	查询条件调整，按dateId筛选数据	4 years ago
yinzuomei	9f7993fdb1	Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop	4 years ago