yinzuomei
|
c6a648db10
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
8f26d41acf
|
指标计算 常量类
|
5 years ago |
wangchao
|
6fc76f9884
|
积分核销加入customerId校验
|
5 years ago |
wxz
|
422b70ddd3
|
版本升级
|
5 years ago |
|
wxz
|
822b450652
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
3a9113179a
|
修复因为合并代码造成的ErrorCode值丢失
|
5 years ago |
|
wxz
|
033dc386a6
|
版本升级
|
5 years ago |
jianjun
|
033416d123
|
statical开发和测试环境 调整堆内存大小
|
5 years ago |
sunyuchao
|
58e713b8f0
|
解决代码合并问题
|
5 years ago |
|
sunyuchao
|
e0e3672e6e
|
Merge branch 'dev'
|
5 years ago |
zxc
|
e9710a261f
|
全区，街道，社区修改五级指标分数插入表
|
5 years ago |
|
jianjun
|
5b42d29627
|
开启线程异步计算
|
5 years ago |
|
sunyuchao
|
cfe22982a4
|
ex_json文件添加小程序名称
|
5 years ago |
|
jianjun
|
89ea820ecd
|
暂时批量插入 还需优化
|
5 years ago |
|
sunyuchao
|
3eaa6b802c
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
yinzuomei
|
58834d9246
|
只有一个网格的事实记录时无需赋值50
|
5 years ago |
zhaoqifeng
|
826a194927
|
ext_json加小程序名称
|
5 years ago |
|
yinzuomei
|
85fbcbd8d4
|
只有一个部门的事实记录时无需赋值50
|
5 years ago |
|
jianjun
|
80bf970102
|
Merge remote-tracking branches 'remotes/origin/dev_bugfix' and 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
b1a42ab250
|
环境变量修改
|
5 years ago |
|
jianjun
|
c9b2810b21
|
部署commonservice
|
5 years ago |
|
jianjun
|
9be2f8c803
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data'
|
5 years ago |
|
jianjun
|
9624b05e7b
|
修改版本
|
5 years ago |
|
jianjun
|
64114ff0ce
|
部署commonservice customize
|
5 years ago |
|
jianjun
|
1e8c8d04ba
|
部署statical
|
5 years ago |
|
jianjun
|
63f9435ca9
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data'
|
5 years ago |
|
jianjun
|
92c18e04a3
|
指标计算数据采集只写入到index库
|
5 years ago |
|
jianjun
|
4f08bccf57
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data'
|
5 years ago |
|
zxc
|
c93af332c6
|
指标优化
|
5 years ago |
|
wxz
|
8643e9f107
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
|
sunyuchao
|
ba3ea2af65
|
bug修改 陌生人无任何角色不能查看定制功能
|
5 years ago |
|
jianjun
|
c45d4d2660
|
插入明细
|
5 years ago |
|
wangchao
|
7329fc42ea
|
积分部分接口修改，对多客户情况进行兼容
|
5 years ago |
|
wangchao
|
ed4a5f8c53
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
zxc
|
642a160d05
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zxc
|
1b9b66c89d
|
add网格修改
|
5 years ago |
|
wxz
|
13f9eb7c28
|
修复错误的FeignClient提交
|
5 years ago |
|
zxc
|
2855f69248
|
add网格修改
|
5 years ago |
|
wxz
|
c394a96217
|
Merge branches 'dev' and 'dev_footbar' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_footbar
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
wangchao
|
0d96028f19
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wxz
|
52d51c432d
|
Merge branch 'dev' into dev_screen_data
|
5 years ago |
|
wxz
|
bcab3028c6
|
修改误提交的FeignClient
|
5 years ago |
|
wxz
|
8766b5642b
|
修改秘钥重置功能，重置db的同时会删除redis中对应的key
|
5 years ago |
|
zxc
|
e89ef5bbce
|
youhua
|
5 years ago |
|
wxz
|
bae12d716b
|
Merge branch 'dev' into dev_externalappauth
|
5 years ago |
|
jianjun
|
9f73a61cfb
|
添加分数子表
|
5 years ago |
|
jianjun
|
743df9757b
|
去掉一条时给50分
|
5 years ago |
|
jianjun
|
df55e4a6cf
|
将计算结果抽取到 大屏相关数据表
|
5 years ago |
|
sunyuchao
|
aabec7cfb1
|
Merge branches 'dev' and 'dev_customize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_customize
|
5 years ago |
zhangyongzhangyong
|
b60c2a2d4c
|
将数据抽取到 指数-指数数据(每月数值) 指数-指数数据(按年统计)，接口修改
|
5 years ago |
