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
|
143b0dd750
|
新增：对外开放应用api列表
|
4 years ago |
yinzuomei
|
aa543e56f4
|
漏发
|
4 years ago |
|
yinzuomei
|
9ae44a45bf
|
群众不满初始化接口
|
4 years ago |
|
yinzuomei
|
609a6deefc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
495384737a
|
群众不满初始化接口
|
4 years ago |
|
yinzuomei
|
ed57ae0222
|
群众不满初始化接口 +1
|
4 years ago |
|
yinzuomei
|
2d7122f10a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
beb21b6b60
|
群众不满初始化接口
|
4 years ago |
zxc
|
e2088fa933
|
增量初始化为 eq
|
4 years ago |
|
jianjun
|
fe912c1856
|
公众参与bug修改 上线
|
4 years ago |
|
jianjun
|
d3a875e03b
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
c5713ac398
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
dbb569fa08
|
原来是取反了吧
|
4 years ago |
|
yinzuomei
|
e459d0e44b
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
d42ffcf690
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
a34ee9fa8d
|
原来是取反了吧
|
4 years ago |
|
jianjun
|
06408162f5
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yinzuomei
|
5a3051d52c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
bc9bcf4308
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
jianjun
|
488fe54b0d
|
Revert "数据融合上线 agg，report，stats，gov-mine，gov-org，oper-crm，user"
This reverts commit f3b24f2c
|
4 years ago |
|
jianjun
|
f3b24f2c4c
|
数据融合上线 agg，report，stats，gov-mine，gov-org，oper-crm，user
|
4 years ago |
|
jianjun
|
04ddf38ce4
|
数据融合上线 agg，report，stats，gov-mine，gov-org，oper-crm，user
|
4 years ago |
|
jianjun
|
e42ba6e3d5
|
Merge remote-tracking branch 'remotes/origin/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
|
72650d68ab
|
公众参与概况接口修改：sql
|
4 years ago |
|
yinzuomei
|
98e175ecbe
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
b4d811a42f
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
75a5f744f4
|
咋美术呢
|
4 years ago |
|
yinzuomei
|
6fa89a54ac
|
/ by zero
|
4 years ago |
|
yinzuomei
|
75346af83a
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
86e50b83f7
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
5a6d64e5e1
|
/ by zero
|
4 years ago |
|
jianjun
|
9fa3f62f9a
|
公众参与 抽取bug shangx
|
4 years ago |
|
jianjun
|
ded0fedb08
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
77d9b0ede9
|
Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
ee10ad21da
|
divide +1
|
4 years ago |
|
jianjun
|
d8577f8501
|
Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
|
4 years ago |
|
yinzuomei
|
b22ef0be25
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
jianjun
|
9d5f2543e7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
21580e3f39
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
jianjun
|
ec98e285f3
|
公众参与 抽取bug
|
4 years ago |
|
yinzuomei
|
286e26e087
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
72a57622b1
|
Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
|
4 years ago |
