yinzuomei
|
2c54aa3d13
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
68e27f881f
|
NullPointerEx fix trytry
|
4 years ago |
zxc
|
43f9ddedb3
|
Merge remote-tracking branch 'origin/dev_public_join' into dev
|
4 years ago |
|
zxc
|
e2c8dabc98
|
Merge remote-tracking branch 'origin/dev_public_join' into develop
|
4 years ago |
|
zxc
|
c429247428
|
数据库指定
|
4 years ago |
|
zxc
|
67ee6c6560
|
增长率
|
4 years ago |
|
yinzuomei
|
686fcce24d
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
45e344cd58
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
149fd98a73
|
小程序端难点赌点列表，返参增加statusDesc
|
4 years ago |
zhaoqifeng
|
350cb1e1a1
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
f5f6ce5472
|
获取指定 月份的前n月 返回yyyyMM
|
4 years ago |
jianjun
|
9648a6d9b1
|
Merge remote-tracking branch 'remotes/origin/dev_gridmember_fusion' into develop
|
4 years ago |
|
jianjun
|
7024d6dd20
|
网格员巡查 适应 数据融合调整
|
4 years ago |
sunyuchao
|
908f09a2d1
|
Merge branch 'dev_oper_role' into dev
|
4 years ago |
|
jianjun
|
e011c5ed7d
|
Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into dev_gridmember_fusion
|
4 years ago |
|
jianjun
|
4cdbd61b56
|
Merge remote-tracking branch 'remotes/origin/dev_grid_member_statistics' into develop
|
4 years ago |
|
zxc
|
d8268745e5
|
screen_user_join表数据抽取
|
4 years ago |
|
jianjun
|
b65b3e2aaa
|
网格员巡查 适应 数据融合调整
|
4 years ago |
|
sunyuchao
|
6e802b25e5
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
c5b5e9c735
|
运营默认权限和客户权限功能名称保持统一排序规则
|
4 years ago |
|
yinzuomei
|
51731c6d61
|
Merge remote-tracking branch 'origin/dev_08bugfix' into dev
|
4 years ago |
|
yinzuomei
|
1a1c0c8f10
|
screen_project_data表采集projectCreateTime修改2
|
4 years ago |
|
jianjun
|
8059011ffb
|
公众参与概括抽取 添加分子分母脚本
|
4 years ago |
|
yinzuomei
|
9b443911db
|
screen_project_data表采集projectCreateTime修改
|
4 years ago |
|
yinzuomei
|
c1904f3856
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
76242aad66
|
难点赌点查询修改，写死areaCode=370124时按照areaCode查询，其余的按照agencyId
|
4 years ago |
|
sunyuchao
|
144eb5e351
|
Merge branch 'dev_oper_role' into dev
|
4 years ago |
|
yinzuomei
|
155a0aefbb
|
难点赌点sql修改
|
4 years ago |
|
sunyuchao
|
ee09c5a914
|
版本晚上线，删除脚本手动执行
|
4 years ago |
|
zhaoqifeng
|
4f9aa367db
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
|
4 years ago |
|
sunyuchao
|
0fbad9d495
|
Merge branch 'dev_oper_role' into dev
|
4 years ago |
|
zhaoqifeng
|
2578794caf
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
ce2629707f
|
治理能力排行-日统计修改
|
4 years ago |
|
yinzuomei
|
f1a4e07f4a
|
Merge remote-tracking branch 'origin/dev_public_join' into dev_public_join
|
4 years ago |
|
yinzuomei
|
b7ebeb3da7
|
公众参与概况publicpartiprofile接口调整
|
4 years ago |
|
jianjun
|
dad42b3f4a
|
Merge remote-tracking branch 'remotes/origin/dev_public_join' into develop
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
|
4 years ago |
|
jianjun
|
13375eba12
|
公众参与概括抽取 添加分子分母
|
4 years ago |
|
yinzuomei
|
0ab807c1f4
|
平阴县查看先锋模范数据sql修改
|
4 years ago |
|
yinzuomei
|
90ff95a3dc
|
Merge branches 'dev' and 'dev_0707bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_0707bugfix
|
4 years ago |
|
yinzuomei
|
1c3660df91
|
/data/stats/screencoll/pioneerdata先锋模范采集接口保存分母
|
4 years ago |
|
sunyuchao
|
53985adabc
|
Merge branch 'dev_gridmember_fusion' into develop
|
4 years ago |
|
sunyuchao
|
240d977050
|
瓜皮子
|
4 years ago |
|
yinzuomei
|
3aa52560e2
|
Merge remote-tracking branch 'origin/dev_0707bugfix' into develop
|
4 years ago |
|
yinzuomei
|
0f3a2f46f9
|
暂存-先锋模范抽取
|
4 years ago |
|
sunyuchao
|
7b199a6fbd
|
Merge branch 'dev_gridmember_fusion' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.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/service/user/UserService.java
|
4 years ago |
|
sunyuchao
|
3d3457e52a
|
Merge remote-tracking branch 'origin/dev_gridmember_fusion' into dev_gridmember_fusion
|
4 years ago |
|
sunyuchao
|
c85e554b91
|
网格员数据分析上报接口调整
|
4 years ago |
|
jianjun
|
0ed743ff04
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
0277ff6109
|
parentId 为空 因为网格可能被删除了
|
4 years ago |
|
yinzuomei
|
c326c79955
|
bug
|
4 years ago |
