wxz
|
62c17e7c7c
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
6acf962060
|
增加终止计算方法
|
5 years ago |
jianjun
|
12eee521ca
|
部署statis
|
5 years ago |
|
jianjun
|
e1e9328538
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
9040792b81
|
修改rediskey
|
5 years ago |
|
jianjun
|
b3c67750aa
|
党员分批计算总分
|
5 years ago |
zhangyongzhangyong
|
487df340ea
|
heart 升级
|
5 years ago |
|
zhangyongzhangyong
|
f3f169264d
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
wangchao
|
f270088f18
|
data-report log配置添加local环境
|
5 years ago |
|
jianjun
|
49b95d992a
|
部署report
|
5 years ago |
|
jianjun
|
4fe396ba07
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
abdf683674
|
5、下级部门指数排行（目前安宁数据端用）, 返回值增加 orgId
|
5 years ago |
|
jianjun
|
f02aa9c618
|
增大堆内存部署
|
5 years ago |
|
jianjun
|
59e02523de
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
|
5 years ago |
|
jianjun
|
e92c0fe1f3
|
增大堆内存
|
5 years ago |
|
wxz
|
041ef8e799
|
版本升级
|
5 years ago |
|
wxz
|
b91af1a7c1
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
1508518489
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
yinzuomei
|
30f9665afb
|
安宁e家客户新增数据采集应用+大屏应用
|
5 years ago |
|
yinzuomei
|
453208d87a
|
安宁e家客户新增数据采集应用+大屏应用
|
5 years ago |
|
wxz
|
0d984cbdd4
|
Merge branch 'dev' into dev_screen_data
|
5 years ago |
|
wxz
|
02fc5d30bc
|
去掉动态数据源的数据源名称打印
|
5 years ago |
|
jianjun
|
7aa843d5eb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
jianjun
|
995d0834c2
|
部署
|
5 years ago |
|
jianjun
|
1619e04a52
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
wangchao
|
d5ce6c40bd
|
data-report 升级
|
5 years ago |
|
jianjun
|
a600e8919e
|
修改大小
|
5 years ago |
|
wangchao
|
0e4b6cbf11
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
wangchao
|
03581bc245
|
subAgencyIndexRank接口添加数据源注解
|
5 years ago |
|
yinzuomei
|
bbbce2d6ce
|
联系群众+参与议事 查询平均值，去掉group by
|
5 years ago |
|
yinzuomei
|
63ff75ac8d
|
report+stas +1
|
5 years ago |
|
yinzuomei
|
c21761908e
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
62aed2ab2a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
jianjun
|
3acab2e0f3
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
jianjun
|
37d782aa8d
|
添加计算时间
|
5 years ago |
|
jianjun
|
f151b5a43c
|
添加计算时间
|
5 years ago |
|
yinzuomei
|
d9f4e94281
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
ecd133006e
|
代码优化
|
5 years ago |
|
wxz
|
7146a43dad
|
版本升级
|
5 years ago |
|
wxz
|
944c3926aa
|
Merge branch 'dev_externalappauth' into dev_temp
|
5 years ago |
|
wxz
|
9c733775b2
|
Merge branch 'dev_externalappauth' into dev_screen_data
|
5 years ago |
|
wxz
|
44d81a9845
|
外部应用，打开token时间戳校验
|
5 years ago |
|
zhangyongzhangyong
|
2444e10d07
|
签到打卡按钮，控制
|
5 years ago |
|
jianjun
|
1bdcad0d53
|
Merge branches 'dev' and 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
jianjun
|
6ec543e9b3
|
部署gateway
|
5 years ago |
|
yinzuomei
|
777d2daa96
|
report+stas +1
|
5 years ago |
|
wxz
|
72a5a7d547
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
bff8003588
|
gateway的pom增加了profile的属性
|
5 years ago |
|
yinzuomei
|
59316e41d0
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
e02f25cf4a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
