Tree: 1edc1af864

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1edc1af864'

${ noResults }

Commit Graph

11228 Commits (1edc1af86441d3340e679e77c5d986edb44f421c)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	8807bbb976	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	5 years ago
zxc	cf696b54ea	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	cb3f063657	//	5 years ago
zxc	4f6eff25a6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	f89395b205	..	5 years ago
zxc	36261d9a38	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	fc3798c9df	street优化	5 years ago
yinzuomei	f8f876345d	Merge remote-tracking branch 'origin/dev_third_data' into dev_temp	5 years ago
yinzuomei	8d041bcbdb	治理指数-网格添加到定时任务	5 years ago
yinzuomei	ee20ebde06	Merge remote-tracking branch 'origin/dev_third_data' into dev_temp	5 years ago
yinzuomei	4d623d98cd	治理指数-网格相关数据校验v1	5 years ago
zxc	08611dfee1	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	6810290c26	11	5 years ago
zxc	f6e02b6c2d	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	708a14a056	11	5 years ago
yinzuomei	082e4370c8	Merge remote-tracking branch 'origin/dev_temp' into dev_temp	5 years ago
zxc	9b714533a0	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	17dad7bd6d	11	5 years ago
yinzuomei	344651c5c7	Merge remote-tracking branch 'origin/dev_third_data' into dev_temp # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java	5 years ago
yinzuomei	c371105861	Merge branches 'dev' and 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_third_data Conflicts: epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java	5 years ago
zxc	519e358a70	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	3b992d2ce4	11	5 years ago
zhaoqifeng	6bf696d540	基层治理-组织的治理指数，按天统计	5 years ago
zxc	6f52475340	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java	5 years ago
zxc	2921b9184b	..	5 years ago
jianjun	d0c9c98771	去掉无用todo	5 years ago
jianjun	3269c1cc83	Revert "添加日志拍错" This reverts commit 0cc27490	5 years ago
jianjun	0645819bc4	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java	5 years ago
jianjun	da43c4bec2	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	5 years ago
jianjun	0cc2749012	添加日志拍错	5 years ago
zxc	c6fa327691	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	a9c2d2d873	11	5 years ago
zxc	bb59267dfa	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	584667dff9	..	5 years ago
zxc	6469f920b3	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	dcfbacee77	street	5 years ago
sunyuchao	acd2135f99	Merge branch 'dev_third_data' into dev_temp	5 years ago
sunyuchao	0b188fcd83	治理指数bug修改	5 years ago
zxc	aa479927f5	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	8b87492813	。	5 years ago
zxc	9af3fbc6e6	街道 能力指数计算修改	5 years ago
yinzuomei	4896097502	Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data	5 years ago
yinzuomei	5250204b5c	治理指数-网格调试1	5 years ago
jianjun	38bb448d60	Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev	5 years ago
sunyuchao	ce9049445f	Merge branch 'dev_notic_bug_syc' into dev	5 years ago
sunyuchao	7fb2c0fa99	生产通知已读未读bug修改	5 years ago
jianjun	7a48624a2f	数据3.0 添加修改权重脚本	5 years ago
zxc	f7205c599c	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	5 years ago
zxc	7bcaae2934	街道级别代码微调	5 years ago
jianjun	52209fb392	Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data	5 years ago