zxc
|
5297d439a6
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
cf1b7e6dc5
|
cpc_base_data插入分批，多个pid修改条件
|
5 years ago |
jianjun
|
1f9ec53c6b
|
部署statis
|
5 years ago |
|
jianjun
|
fc40b2c73e
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
3c2dc8fd95
|
部署statis
|
5 years ago |
|
jianjun
|
ab85d2cff3
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev_temp
# Conflicts:
# 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-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/resi-group/resi-group-server/pom.xml
|
5 years ago |
|
jianjun
|
9fcd7690d2
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_screen_data_2.0
|
5 years ago |
wangchao
|
f09a68a09d
|
data-stats 170
|
5 years ago |
|
wangchao
|
837c32cf3c
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
e20b977f9b
|
对吹哨次数、吹哨项目数的重新定义
|
5 years ago |
zhaoqifeng
|
d1a67d8b00
|
被吹哨次数统计修改
|
5 years ago |
|
jianjun
|
2544c49dac
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
990d131303
|
优化redis key及
|
5 years ago |
|
zhaoqifeng
|
3b443ad5c4
|
被吹哨次数统计修改
|
5 years ago |
|
jianjun
|
16b9c26d87
|
部署statis
|
5 years ago |
|
jianjun
|
53b5e61745
|
反正切 公式错误
|
5 years ago |
|
wangchao
|
07211f3867
|
data-stats 169
|
5 years ago |
|
wangchao
|
eae98b5a3b
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wangchao
|
da021134ff
|
对办结率、办结效率的算法修改
|
5 years ago |
|
jianjun
|
94273defc7
|
部署statis
|
5 years ago |
|
jianjun
|
65cd3a4464
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
388931e3ce
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
b2f0e7a34f
|
修改origin数据抽取 参数错误
|
5 years ago |
|
jianjun
|
88650ab408
|
部署statis
|
5 years ago |
|
jianjun
|
c9ef220c71
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
dad2efa2da
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
ea86976da2
|
错误抛出 继续计算
|
5 years ago |
|
jianjun
|
934d75ea4c
|
生产部署statis
|
5 years ago |
|
jianjun
|
31e13a7f92
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
3bc6a73643
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
6e80fe7366
|
添加日志排除问题
|
5 years ago |
|
jianjun
|
b34a562140
|
生产部署statis
|
5 years ago |
|
jianjun
|
2f7a68526c
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
78aae336c8
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
ed696007e1
|
添加日志排除问题
|
5 years ago |
wxz
|
eb4f6ba113
|
版本升级
|
5 years ago |
|
wxz
|
6f26160b4a
|
修改配置错误
|
5 years ago |
|
wxz
|
ac0e8f9f71
|
版本升级
|
5 years ago |
|
wxz
|
a7513775d5
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
8ca4536eb0
|
Merge branch 'dev_externalappauth' into dev
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
90d57c7bbf
|
版本升级
|
5 years ago |
|
wxz
|
f394c641ce
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
02218b6856
|
Merge branch 'dev_screen_data_an_2.0' into dev
|
5 years ago |
|
wxz
|
19929b8a6d
|
Merge branch 'dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
bf214698a6
|
反正切函数 兼容正负相关
|
5 years ago |
|
wangchao
|
636548a2a5
|
data-stats +1 对应的修改：办结率 = 办结数/评价周期内被吹哨次数
|
5 years ago |
|
wangchao
|
f4b78ee2bb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
sunyuchao
|
f6a3bedbf6
|
同级对比接口月度ID非必填
|
5 years ago |
|
sunyuchao
|
76fcea01cc
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
sunyuchao
|
cb27a26417
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
