zhaoqifeng
|
46445eb6ab
|
小组等级更新bug修改
|
4 years ago |
zxc
|
d6c2cf55fe
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
sunyuchao
|
daf257506c
|
基础数据上报 部分接口
|
4 years ago |
|
zxc
|
ebfef35c6e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_fusion
Conflicts:
epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
yinzuomei
|
de69be0ede
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
jianjun
|
5d7054c65d
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
|
4 years ago |
|
jianjun
|
c289d02970
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
0679a24421
|
添加日志 用户未登录异常
|
4 years ago |
|
yinzuomei
|
b25781f844
|
/gov/mine/agency/getlatestcustomer返参增加haveSubCustomer、subCustomerIds
|
4 years ago |
|
yinzuomei
|
4baf1408f6
|
SATISFACTION_SCORE修改
|
4 years ago |
|
jianjun
|
0f4bc88ca3
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into develop
|
4 years ago |
|
jianjun
|
d203cfea9e
|
大屏网格员列表返回手机号（org，user，report）代码微调
|
4 years ago |
|
yinzuomei
|
6a79f698ce
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
yinzuomei
|
ff85e01f2e
|
难点赌点列表：difficultyrank-multic
|
4 years ago |
|
sunyuchao
|
ead5b4ea62
|
Merge branch 'dev_oper_role' into dev
|
4 years ago |
|
sunyuchao
|
498c9dd692
|
14个基础数据上报接口模板
|
4 years ago |
|
jianjun
|
f39ccc2a3f
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into develop
|
4 years ago |
|
jianjun
|
dfa7c80111
|
大屏网格员列表返回手机号（org，user，report）
|
4 years ago |
|
zxc
|
827ce44c3d
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
672662f04e
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
yinzuomei
|
8973ce412e
|
难点赌点列表：difficultyrank-multic
|
4 years ago |
|
jianjun
|
a301f2c8f7
|
Merge remote-tracking branch 'remotes/origin/dev_data_fusion' into develop
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
zhaoqifeng
|
f74080fb3b
|
网格员巡查功能接口bug修改
|
4 years ago |
|
jianjun
|
f656bd9c43
|
gataway拦截 point请求 mqcallback 放行
|
4 years ago |
|
jianjun
|
da71725a8c
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_count' into dev
|
4 years ago |
|
yinzuomei
|
57e78be08b
|
难点堵点-组织下拉框"mynextagency-multic"v2
|
4 years ago |
|
sunyuchao
|
a899c6ec0d
|
Merge branch 'dev_bug_tmd' into develop
|
4 years ago |
|
sunyuchao
|
392b75c355
|
更多-巡查记录列表可查看当前组织及下级所有网格列表下数据
|
4 years ago |
|
yinzuomei
|
45a9dd7c37
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
yinzuomei
|
c2837745c3
|
难点堵点-组织下拉框"mynextagency-multic"
|
4 years ago |
|
zxc
|
7d13637747
|
孔村，榆山，锦水pid更为平阴
|
4 years ago |
|
zxc
|
55b0bd1e2d
|
Merge remote-tracking branch 'origin/dev_patrol_count' into develop
|
4 years ago |
|
zxc
|
0738a81aee
|
dto位置
|
4 years ago |
|
zxc
|
0153b74a54
|
Merge remote-tracking branch 'origin/dev_patrol_count' into develop
|
4 years ago |
|
zxc
|
c6656f8a3e
|
巡查中和未巡查中人数
|
4 years ago |
|
yinzuomei
|
4435ca66d2
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
yinzuomei
|
1700d1f08b
|
bug修改
|
4 years ago |
wxz
|
06b6982b44
|
Merge branch 'wxz_avg_samplecount' into dev
|
4 years ago |
|
wxz
|
f2c1d6ae9a
|
Merge branch 'wxz_avg_samplecount' into develop
|
4 years ago |
|
wxz
|
d9a013697a
|
为多客户情况下的计算，增加平均值指标参与计算数量的字段
|
4 years ago |
|
zhaoqifeng
|
7d0332212c
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
f845798d26
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
5af2524824
|
治理能力排行数据统计逻辑修改
|
4 years ago |
|
wxz
|
ac4c168cd8
|
Merge branch 'wxz_avg_samplecount' into develop
|
4 years ago |
|
wxz
|
2783dab148
|
修复：平均值计算，没有生成sample_count的bug
|
4 years ago |
|
sunyuchao
|
581b95f28d
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
ae2e9762ce
|
bug修改
|
4 years ago |
|
sunyuchao
|
f7074a03b9
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
211018e5dd
|
批量保存改单条
|
4 years ago |
|
sunyuchao
|
bedb210560
|
启动页sql脚本
|
4 years ago |
