jianjun
|
92d1c4f82c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
da79a716d3
|
下级组织单项指数得分排行接口
|
5 years ago |
wxz
|
a6bfc90fb0
|
Merge branch 'dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
wxz
|
403fa91e79
|
Merge branch 'dev_screen_data_2.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data_2.0
Conflicts:
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
|
5 years ago |
|
wxz
|
ed091e9906
|
新增：根据appId生成jwt AccessToken的FeignCLient
|
5 years ago |
zxc
|
9cb09ee8e8
|
report服务升级
|
5 years ago |
|
zxc
|
a69822ab72
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zxc
|
f3bd0efcda
|
report服务升级
|
5 years ago |
|
zxc
|
d76e9d0224
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
51acdf7b76
|
智慧社区的tree修改
|
5 years ago |
|
wxz
|
25e1e12029
|
新增：根据appId生成jwt AccessToken的接口
|
5 years ago |
sunyuchao
|
1b5b980446
|
服务升级
|
5 years ago |
|
sunyuchao
|
ab3ba8f984
|
Merge branch 'dev' into dev_temp
|
5 years ago |
|
sunyuchao
|
77470d817c
|
Merge branch 'master_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
97e5993006
|
bug修改 返回下一级组织数不正确问题
|
5 years ago |
|
jianjun
|
9303a2dfe2
|
部署report 116
|
5 years ago |
|
jianjun
|
7c2080595a
|
部署statis 188
|
5 years ago |
|
jianjun
|
0bd126626d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
7bbeae4bdb
|
真假数据源
|
5 years ago |
|
jianjun
|
adcdc2b74b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
ab559e9050
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
5f79f10143
|
如果没有区划 则默认暂时不显示
|
5 years ago |
|
zxc
|
e1834ff031
|
statis、report服务升级
|
5 years ago |
|
zxc
|
bc23ed149c
|
statis、job服务升级
|
5 years ago |
|
zxc
|
15355a5b40
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
fd9174f26d
|
智慧社区的tree修改
|
5 years ago |
|
jianjun
|
744922381d
|
添加初始化客户业务类型关系接口 用于控制
|
5 years ago |
|
zxc
|
eba00a4d1c
|
智慧社区的tree
|
5 years ago |
|
zxc
|
e11f847660
|
treebytype接口添加
|
5 years ago |
|
zxc
|
0fe416c921
|
treebytype接口添加
|
5 years ago |
|
zxc
|
cc27e76e7f
|
treebytype接口添加
|
5 years ago |
|
zxc
|
de9ca7019e
|
dimPartyMember信息统计修改
|
5 years ago |
|
zxc
|
9950a85b12
|
statis、job服务升级
|
5 years ago |
|
zxc
|
b208da1106
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
f2428906e9
|
dimPartyMember信息统计添加指定时间区间
|
5 years ago |
|
sunyuchao
|
512d99c676
|
Merge branch 'master_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
0eb88e00dc
|
临时修改查询附近网格数为200
|
5 years ago |
|
jianjun
|
8350ef5913
|
归一区间 描述
|
5 years ago |
|
zxc
|
284e16f34c
|
说明文档添加
|
5 years ago |
|
zxc
|
fd7241716f
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
zxc
|
2920d759a7
|
说明文档添加
|
5 years ago |
|
jianjun
|
3884978e90
|
归一区间 描述
|
5 years ago |
|
zxc
|
cb8d5497e0
|
计算器修改
|
5 years ago |
|
wxz
|
3f4ac49309
|
版本升级
|
5 years ago |
|
zxc
|
9fe57ebb8c
|
screen_index_data_monthly表里缺少数据，添加备注
|
5 years ago |
|
wxz
|
9b8e93ecbd
|
Merge branch 'dev_screen_data_2.0' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wxz
|
c6bc8e2885
|
preDestory增加日志
|
5 years ago |
|
wxz
|
9639e7f6ec
|
修改Dockerfile ENTRYPOINT，增加exec
|
5 years ago |
|
jianjun
|
95b592c657
|
插入指标计算结果数据到大屏去掉事务，添加分布式锁
|
5 years ago |
|
jianjun
|
e26defa56c
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_screen_data_2.0
|
5 years ago |
