wxz
|
ba0551fbe1
|
版本升级
|
5 years ago |
|
wxz
|
1e1c0870a9
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
633a152671
|
修改错误
|
5 years ago |
jianjun
|
bd43378b7a
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
02a634e20e
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev
|
5 years ago |
|
jianjun
|
e0e61800c8
|
添加客户端Ip
|
5 years ago |
|
wxz
|
46ce72aa9d
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
781dae5c92
|
Merge branch 'dev_footbar_cache' into dev
|
5 years ago |
|
wxz
|
3f08c4e1fa
|
Merge branch 'dev' into dev_footbar_cache
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
jianjun
|
b60a9fb6be
|
部署third服务 添加代码模版管理
|
5 years ago |
|
jianjun
|
5634fdebdb
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
52ca934a7d
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev
|
5 years ago |
zhaoqifeng
|
cbda379962
|
代码模板管理
|
5 years ago |
|
wxz
|
b1ded7db2c
|
版本升级
|
5 years ago |
|
wxz
|
6c9e667e87
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
0195e7ec54
|
调整内外部认证，支持同时使用内外部认证
|
5 years ago |
|
jianjun
|
810b3fecea
|
部署partymember 解决 党员认证时，网格校验参数
|
5 years ago |
|
jianjun
|
ac6615d193
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
01b9373440
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix
|
5 years ago |
wangchao
|
02915fc883
|
党员认证提交记录校验去除网格Id，如果居民在一个网格下申请了党员，在其余网格不能再次申请党员。
|
5 years ago |
sunyuchao
|
54f4529c24
|
服务升级
|
5 years ago |
|
sunyuchao
|
b75ceb78f3
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
bfe8058437
|
按客户查询模板Id列表
|
5 years ago |
|
sunyuchao
|
e3524400a1
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
jianjun
|
d2f52b40cc
|
部署report，statis，project 解决：五级指标添加返回值，以及城阳大屏返回项目详情接口
|
5 years ago |
|
jianjun
|
cc70f49987
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java
|
5 years ago |
|
jianjun
|
e1e9ec5f1e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
zxc
|
ca48ac6fa5
|
项目详情修改
|
5 years ago |
|
zxc
|
1d81408cf4
|
党支部分布，用户分布，党员分布 调整显示智慧社区要显示的
|
5 years ago |
|
jianjun
|
9f3ee08553
|
添加注释
|
5 years ago |
|
jianjun
|
1949da956b
|
五级指标原始值 添加权重
|
5 years ago |
|
zxc
|
23d4e4a8ca
|
项目详情
|
5 years ago |
|
zxc
|
ed2739ae60
|
项目详情
|
5 years ago |
|
zxc
|
3007f286f1
|
项目详情
|
5 years ago |
|
jianjun
|
b943131d11
|
本级及下级 乘以权重
|
5 years ago |
|
zxc
|
a5915b1196
|
项目详情
|
5 years ago |
|
zxc
|
328a76a173
|
项目详情
|
5 years ago |
|
jianjun
|
ce6613c174
|
数据中乘以权重
|
5 years ago |
|
jianjun
|
7be1818afc
|
部署report 67
|
5 years ago |
|
jianjun
|
1625f7969e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
f0ce88c099
|
区划限制显示
|
5 years ago |
|
jianjun
|
a97838a1d3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
c80561d30a
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
4564033dac
|
项目详情
|
5 years ago |
|
jianjun
|
2a3eb25d1f
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
27dbc20c8a
|
项目详情
|
5 years ago |
|
wxz
|
23ca1b5fb4
|
版本升级
|
5 years ago |
|
jianjun
|
fd5796353e
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zxc
|
79c8e0fa32
|
项目详情
|
5 years ago |
|
jianjun
|
ec18ded05c
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
