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
|
848003b31a
|
一个错误包路径引发的xa
|
4 years ago |
|
yinzuomei
|
63ca74ab2c
|
zancun
|
4 years ago |
|
yinzuomei
|
10aeedb037
|
zancun
|
4 years ago |
|
yinzuomei
|
ad84f3d618
|
zancun
|
4 years ago |
sunyuchao
|
eb9880d32c
|
Merge branch 'dev_gridmember_fusion' into dev
|
4 years ago |
zxc
|
8fbbfb7433
|
emm ，修改
|
4 years ago |
|
yinzuomei
|
3ac1a523b5
|
工作日志插件数据采集增加pid,pids。
|
4 years ago |
|
sunyuchao
|
760e0bed70
|
误删代码 人才的不行
|
4 years ago |
|
zxc
|
85b7994e58
|
.
|
4 years ago |
|
zxc
|
e9f7eb0609
|
默认值为空串
|
4 years ago |
|
zxc
|
6e46d0891e
|
徽章认证修改
|
4 years ago |
|
sunyuchao
|
5cc98b1a6a
|
两个方法都要改
|
4 years ago |
|
yinzuomei
|
a81548fdbb
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
65edd3e726
|
网格员数据上报bug修改
|
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
|
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 |
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
|
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
|
b4d811a42f
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
yinzuomei
|
75a5f744f4
|
咋美术呢
|
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
|
77d9b0ede9
|
Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev
|
4 years ago |
|
jianjun
|
d8577f8501
|
Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
|
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 |
|
yinzuomei
|
12771cb0a8
|
divide
|
4 years ago |
|
zxc
|
8401073e53
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
zxc
|
b34fdb9ced
|
bug
|
4 years ago |
|
jianjun
|
d706e3dbb8
|
Merge remote-tracking branch 'remotes/origin/dev_public_join' into dev
|
4 years ago |
|
jianjun
|
575c344d45
|
公众参与 查询bug
|
4 years ago |
