jianjun
|
622fb9e197
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
c1578883fd
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
|
4 years ago |
|
jianjun
|
81a76d4f5e
|
巡查 上线 配合大屏显示
|
4 years ago |
zhaoqifeng
|
ff7f725c86
|
网格员巡查功能接口
|
4 years ago |
|
jianjun
|
d63331103a
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
|
4 years ago |
|
jianjun
|
d09771f5d7
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
|
4 years ago |
|
jianjun
|
fab1ec8470
|
项目立项定位 上线
|
4 years ago |
|
jianjun
|
8356858006
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
d22e851529
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_grid_patrol
|
4 years ago |
|
jianjun
|
2c711d6039
|
日志bug
|
4 years ago |
|
jianjun
|
a2f6ece50d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_project_location
|
4 years ago |
|
jianjun
|
d20a64c8b7
|
日志bug
|
4 years ago |
|
jianjun
|
a9c1f527ff
|
日志
|
4 years ago |
|
zhaoqifeng
|
98a1bbc029
|
网格员巡查功能接口
|
4 years ago |
|
jianjun
|
3e56eff0d0
|
逻辑修改
|
4 years ago |
|
jianjun
|
679a465970
|
添加日志
|
4 years ago |
|
jianjun
|
f8c2b510e8
|
立项添加经纬度后 直接立项的项目 添加经纬度和地址 同步到指标库的项目数据中；满意度评价 项目分类 上线；
|
4 years ago |
|
jianjun
|
18421454a7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
da082ec6f4
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
zxc
|
bb50edf9cc
|
made项目立项给80
|
4 years ago |
|
jianjun
|
2b55a893b9
|
立项添加经纬度后 直接立项的项目 添加经纬度和地址 同步到指标库的项目数据中
|
4 years ago |
|
zxc
|
4a40660253
|
立项的项目给0分
|
4 years ago |
|
jianjun
|
3092366971
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_project_location
|
4 years ago |
|
zhaoqifeng
|
0cd0e56b58
|
网格员巡查功能接口
|
4 years ago |
|
jianjun
|
687d5cf91a
|
修改更新中心点 按名称左匹配
|
4 years ago |
|
jianjun
|
ed698777dd
|
修改更新中心点 按组织去修改
|
4 years ago |
|
jianjun
|
e3682cb613
|
修改更新中心点的条件 不为空时才修改
|
4 years ago |
|
jianjun
|
8ce33e9a3c
|
修改更新中心点的条件 不为空时才修改
|
4 years ago |
sunyuchao
|
4e93952cb6
|
sql脚本调整
|
4 years ago |
|
jianjun
|
426bab927c
|
巡查记录主表脚本文件添加
|
4 years ago |
|
zxc
|
9a7fcd3b82
|
群众不满
|
4 years ago |
|
zhaoqifeng
|
16fcf90426
|
网格员巡查功能接口
|
4 years ago |
|
zhaoqifeng
|
e2e77dfb13
|
网格员巡查功能接口
|
4 years ago |
|
sunyuchao
|
cc7b97f37c
|
列表网格名拼接到上两级组织名称，恶心人的玩意
|
4 years ago |
|
zxc
|
28795cfd31
|
分类修改
|
4 years ago |
|
zxc
|
0f6a9e12a7
|
大屏巡查
|
4 years ago |
|
jianjun
|
f569b3adcd
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_patrol
|
4 years ago |
|
jianjun
|
135936f874
|
修改网格中心点时去掉 参数里的委会
|
4 years ago |
|
sunyuchao
|
3f39233214
|
取值错误修改
|
4 years ago |
|
sunyuchao
|
d584fc2835
|
修改sql版本冲突
|
4 years ago |
|
jianjun
|
bf4192e2f0
|
项目数据抽取到大屏 设置直接立项的 联系人及电话 其他待调整；修改 获取网格员的条件-》上线
|
4 years ago |
|
jianjun
|
cf6a0d9964
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
4f3ae1e7f7
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3de74d7681
|
项目数据抽取到大屏 设置直接立项的 联系人及电话 其他待调整；修改 获取网格员的条件
|
4 years ago |
|
jianjun
|
1eb61b3725
|
项目数据抽取到大屏 多余代码注释掉
|
4 years ago |
|
jianjun
|
026851fc2b
|
格式化代码
|
4 years ago |
|
jianjun
|
adfd995246
|
联建共建bug修改 测试下 看看 恢复代码，上线
|
4 years ago |
|
jianjun
|
be2a81085b
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
3a4175d7bb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
55a3cf5b1e
|
Revert "联建共建bug修改 测试下 看看"
This reverts commit d2ce490f
|
4 years ago |
