Tree: a05358b94c

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'a05358b94c'

${ noResults }

Commit Graph

10549 Commits (a05358b94c3e4352dfb6eca3d912b31652f46a39)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	a05358b94c	Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp	4 years ago
yinzuomei	fe65d9e3b9	去其他网格看看，bug修改测试	4 years ago
yinzuomei	41c173b711	暂存一下	4 years ago
sunyuchao	06ff14e103	Merge branch 'dev_third_data' into dev_temp	4 years ago
sunyuchao	a7501bd188	遗漏修改点	4 years ago
jianjun	6f86840107	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp	4 years ago
jianjun	f7d78efa1d	判断调整	4 years ago
zxc	e87578efe4	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	f2749b6b0d	..	4 years ago
zxc	71dfb06283	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/IndexCalculateDistrictServiceImpl.java	4 years ago
zxc	952f4e862c	..	4 years ago
sunyuchao	22f980c857	Merge branch 'dev_third_data' into dev_temp	4 years ago
yinzuomei	6bcd4dd1ab	Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp	4 years ago
yinzuomei	8f2965c7ac	/resi/hall/issue/detail返回groupName	4 years ago
sunyuchao	cb2b13b320	组织、网格治理指数查询，百分数改成带%的	4 years ago
zxc	2e7d3ac3ec	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	f9ed86ef96	街道 三大能力计算 注释添加	4 years ago
zxc	5dd57ff22a	社区级别计算平均值的时候，分组字段修改	4 years ago
zhaoqifeng	4caa0b1ddd	Merge branch 'dev_third_data' into dev_temp	4 years ago
zhaoqifeng	5352aca32b	党员先锋sql脚本	4 years ago
zxc	1095fd647b	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	a5eca6dac7	社区 三大能力计算代码微调	4 years ago
zxc	cf696b54ea	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	cb3f063657	//	4 years ago
zxc	4f6eff25a6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	f89395b205	..	4 years ago
zxc	36261d9a38	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	fc3798c9df	street优化	4 years ago
yinzuomei	f8f876345d	Merge remote-tracking branch 'origin/dev_third_data' into dev_temp	4 years ago
yinzuomei	8d041bcbdb	治理指数-网格添加到定时任务	4 years ago
yinzuomei	ee20ebde06	Merge remote-tracking branch 'origin/dev_third_data' into dev_temp	4 years ago
yinzuomei	4d623d98cd	治理指数-网格相关数据校验v1	4 years ago
zxc	08611dfee1	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	6810290c26	11	4 years ago
zxc	f6e02b6c2d	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	708a14a056	11	4 years ago
yinzuomei	082e4370c8	Merge remote-tracking branch 'origin/dev_temp' into dev_temp	4 years ago
zxc	9b714533a0	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	17dad7bd6d	11	4 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	4 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	4 years ago
zxc	519e358a70	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp	4 years ago
zxc	3b992d2ce4	11	4 years ago
zhaoqifeng	6bf696d540	基层治理-组织的治理指数，按天统计	4 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	4 years ago
zxc	2921b9184b	..	4 years ago
jianjun	d0c9c98771	去掉无用todo	4 years ago
jianjun	3269c1cc83	Revert "添加日志拍错" This reverts commit 0cc27490	4 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	4 years ago
jianjun	da43c4bec2	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago