wxz
|
67376491d0
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
6dc69d00e4
|
Merge branch 'dev_plugins' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
# epmet-gateway/pom.xml
# epmet-module/data-report/data-report-server/pom.xml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-mine/resi-mine-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
zxc
|
f76805e8ba
|
statis服务升级
|
5 years ago |
|
zxc
|
fedfed99b3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
5958b1f138
|
归一数值调整为 60 - 100
|
5 years ago |
|
wxz
|
32359e9f7a
|
升级ext服务的外部应用请求鉴权，使用gateway统一鉴权
|
5 years ago |
|
wxz
|
63d8c0aa2f
|
增加epmet-ext的开放url
|
5 years ago |
jianjun
|
b194abb708
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
81abe2e40e
|
合并错误修改
|
5 years ago |
|
jianjun
|
b1428bacb0
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev
|
5 years ago |
|
jianjun
|
9fbbae502e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml
|
5 years ago |
wangchao
|
a8f7e88155
|
data-stats 165
|
5 years ago |
|
wangchao
|
5a314afe6e
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
9480c405b9
|
sql
|
5 years ago |
|
wangchao
|
dd81afecd9
|
data-stats 164
|
5 years ago |
|
wangchao
|
a530e977e9
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
dabd753cdd
|
sql错误
|
5 years ago |
|
wangchao
|
b162fb8ded
|
data-stats 163
|
5 years ago |
|
wangchao
|
3a8d9c5777
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
7268a79ca6
|
机关各种度数据传入客户Id
|
5 years ago |
|
wangchao
|
41e8f807d7
|
data-stats 162
|
5 years ago |
|
wangchao
|
d970d971df
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
e62136dead
|
sql 修改
|
5 years ago |
|
wangchao
|
1e7557b3d0
|
data-stats 161
|
5 years ago |
|
wangchao
|
8affc4bd85
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
0de8e7826e
|
修复
|
5 years ago |
|
wangchao
|
89c322fcc7
|
data-stats 160
|
5 years ago |
|
wangchao
|
98cbd76c02
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
3bf1200f91
|
解决sql报错
|
5 years ago |
|
wangchao
|
ce23235c6e
|
data-stats 159
|
5 years ago |
|
wangchao
|
451b9f79b1
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
060a10d43e
|
去除多于代码
|
5 years ago |
|
wangchao
|
65caf109f3
|
data-stats +1 -> 158
|
5 years ago |
|
wangchao
|
c3959e345b
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
96e5def4bd
|
sql字段修改
|
5 years ago |
|
wangchao
|
bcee97c3ca
|
结案率
|
5 years ago |
|
jianjun
|
8520640f45
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev
|
5 years ago |
yinzuomei
|
8b46cd05d5
|
修改客户权重信息漏题
|
5 years ago |
|
yinzuomei
|
9545538623
|
修改客户权重信息v3
|
5 years ago |
|
yinzuomei
|
cbac5e8ca8
|
修改客户权重信息v2
|
5 years ago |
|
jianjun
|
0cfab2f2b2
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev
|
5 years ago |
|
yinzuomei
|
9dcc589595
|
修改客户权重信息
|
5 years ago |
|
jianjun
|
f25d6cfe8f
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_screen_data_an_2.0
|
5 years ago |
|
jianjun
|
40c3c35e69
|
部署report，statis
|
5 years ago |
|
jianjun
|
1a38785ff6
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
9fd7ccb9d2
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
3219dc2db9
|
修改公众参与排行；2 党员积分/指标排行 数据采集添加字段
|
5 years ago |
|
zxc
|
360d6f6e86
|
statis服务升级
|
5 years ago |
|
zxc
|
325c7bc774
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
3f68f42879
|
查询条件 close
|
5 years ago |
