Tree: 8798b7abb5

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '8798b7abb5'

${ noResults }

Commit Graph

11867 Commits (8798b7abb570b07f53e2e5c1d69f15c92b9ca131)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	bac441ebac	Merge remote-tracking branch 'origin/dev_bug_auth_badge' into develop	4 years ago
zxc	8fbbfb7433	emm ，修改	4 years ago
yinzuomei	3ac1a523b5	工作日志插件数据采集增加pid,pids。	4 years ago
sunyuchao	3171689e16	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
sunyuchao	760e0bed70	误删代码 人才的不行	4 years ago
zhaoqifeng	85c2ba3fa4	Merge branch 'dev_patrol_end' into develop	4 years ago
zhaoqifeng	53d6b3a571	自动结束巡查定时任务	4 years ago
zhaoqifeng	8d22f53a3e	Merge branch 'dev_patrol_end' into develop	4 years ago
zhaoqifeng	7bf2bb09b8	自动结束巡查定时任务	4 years ago
zhaoqifeng	0f69b23181	Merge branch 'dev_patrol_end' into develop	4 years ago
zhaoqifeng	48df97e347	Merge branches 'dev' and 'dev_patrol_end' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_patrol_end	4 years ago
zxc	30dd08ed99	Merge branch 'dev_bug_auth_badge' into develop	4 years ago
zxc	85b7994e58	.	4 years ago
zxc	54ee0ceb0e	Merge branch 'dev_bug_auth_badge' into develop	4 years ago
zxc	e9f7eb0609	默认值为空串	4 years ago
jianjun	a7810140ff	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	06a20539d1	Merge remote-tracking branch 'remotes/origin/wxz_feign_datetime' into develop	4 years ago
zxc	a8c1f39d7d	Merge remote-tracking branch 'origin/dev_bug_auth_badge' into develop	4 years ago
zxc	6e46d0891e	徽章认证修改	4 years ago
zhaoqifeng	55aff9eaec	自动结束巡查定时任务	4 years ago
sunyuchao	20d683ff4c	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
sunyuchao	5cc98b1a6a	两个方法都要改	4 years ago
yinzuomei	a81548fdbb	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
sunyuchao	2f47de4188	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
sunyuchao	65edd3e726	网格员数据上报bug修改	4 years ago
yinzuomei	9e8730346c	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	8c7e7d90c6	"dataclient/subagencyindexrank",孔村镇单独处理	4 years ago
yinzuomei	96122d5b76	群里报错：查询党员待审核详情接口，sql修改	4 years ago
jianjun	eaf6dc0bc0	Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev	4 years ago
yinzuomei	5c3443ff97	已经提示给前端的日志降级以免费眼,查询党员待审核详情接口修改	4 years ago
jianjun	fc4eb6eec0	Merge remote-tracking branch 'remotes/origin/dev_index_explain_fix' into develop	4 years ago
jianjun	110e0278af	Merge remote-tracking branch 'remotes/origin/dev' into dev_gridmember_fusion # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java	4 years ago
jianjun	36bd27b601	得分说明 上下级添加具体分数	4 years ago
jianjun	94eab60e03	Merge remote-tracking branch 'remotes/origin/dev' into dev_index_explain_fix	4 years ago
zhaoqifeng	f277a947a0	Merge branch 'dev_bugfix_ljj' into dev # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java	4 years ago
zhaoqifeng	3445fe4deb	项目数据上报删除改为物理删除	4 years ago
wxz	0c1230ea70	Merge branch 'dev_gridmember_fusion' into develop	4 years ago
wxz	143b0dd750	新增：对外开放应用api列表	4 years ago
yinzuomei	495384737a	群众不满初始化接口	4 years ago
yinzuomei	beb21b6b60	群众不满初始化接口	4 years ago
zxc	e2088fa933	增量初始化为 eq	4 years ago
jianjun	304b214681	Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev	4 years ago
jianjun	95bc679418	公众参与bug修改	4 years ago
yinzuomei	d42ffcf690	Merge remote-tracking branch 'origin/dev_public_join' into dev	4 years ago
yinzuomei	a34ee9fa8d	原来是取反了吧	4 years ago
yinzuomei	bc9bcf4308	Merge remote-tracking branch 'origin/dev_public_join' into dev	4 years ago
jianjun	3071876d59	数据融合合并	4 years ago
yinzuomei	492813fd98	公众参与采集接口调整	4 years ago
jianjun	51b478d47c	Merge remote-tracking branch 'remotes/origin/dev_data_fusion' into dev # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java # epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml	4 years ago
yinzuomei	0d40c6d5ad	Merge remote-tracking branch 'origin/dev_data_fusion' into develop	4 years ago