wxz
|
07a8f41cc6
|
Merge branch 'wxz_project_changed_stats_consum' into develop
|
4 years ago |
|
wxz
|
0cb9df24d3
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
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/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 |
|
wxz
|
3ef982b5d4
|
修改：项目变动rocketmq消费者，限制消费率逻辑微调
|
4 years ago |
jianjun
|
a19813560f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
|
4 years ago |
|
jianjun
|
49f1d0074f
|
月度得分 返回权重和原始值
|
4 years ago |
yinzuomei
|
a1c5ca0581
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
|
4 years ago |
|
yinzuomei
|
c35333ddb8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
848003b31a
|
一个错误包路径引发的xa
|
4 years ago |
zhaoqifeng
|
1a540e2ab4
|
Merge branch 'dev_patrol_end' into develop
|
4 years ago |
|
zhaoqifeng
|
e8de20b4c0
|
自动结束巡查定时任务
|
4 years ago |
|
yinzuomei
|
69a08e61fd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
|
4 years ago |
|
yinzuomei
|
63ca74ab2c
|
zancun
|
4 years ago |
|
yinzuomei
|
10aeedb037
|
zancun
|
4 years ago |
|
jianjun
|
7fa783bc3b
|
Merge remote-tracking branch 'remotes/origin/dev_index_explain_fix' into develop
|
4 years ago |
|
jianjun
|
d6ce456ed8
|
得分说明 补充下下区县级的得分说明
|
4 years ago |
|
yinzuomei
|
ad84f3d618
|
zancun
|
4 years ago |
sunyuchao
|
eb9880d32c
|
Merge branch 'dev_gridmember_fusion' into dev
|
4 years ago |
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 |
