jianjun
|
ae8978089d
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
d20a64c8b7
|
日志bug
|
4 years ago |
|
jianjun
|
26f82446c8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
a9c1f527ff
|
日志
|
4 years ago |
zhaoqifeng
|
0620ba6d57
|
Merge branch 'dev_grid_patrol' into develop
|
4 years ago |
|
zhaoqifeng
|
98a1bbc029
|
网格员巡查功能接口
|
4 years ago |
|
jianjun
|
c058549906
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
3e56eff0d0
|
逻辑修改
|
4 years ago |
|
jianjun
|
679a465970
|
添加日志
|
4 years ago |
|
jianjun
|
da082ec6f4
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
wxz
|
2f65ed7df5
|
修改admin服务的rocketmq nameserver链接地址
|
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 |
|
wxz
|
ac2a70b2b4
|
Merge branch 'dev_temp' into develop
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
|
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 |
|
wxz
|
6b9d38af94
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
4a5b122061
|
去掉多余import
|
4 years ago |
|
wxz
|
61efb2e21c
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
9e873d2595
|
日志模块，增加ip,app,client,operatorName,operatorMobile字段
|
4 years ago |
|
jianjun
|
426bab927c
|
巡查记录主表脚本文件添加
|
4 years ago |
|
zxc
|
c5c90fd5e9
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
9a7fcd3b82
|
群众不满
|
4 years ago |
|
zhaoqifeng
|
16fcf90426
|
网格员巡查功能接口
|
4 years ago |
|
zhaoqifeng
|
e2e77dfb13
|
网格员巡查功能接口
|
4 years ago |
|
sunyuchao
|
54cdfee89b
|
Merge branch 'dev_grid_patrol' into dev_temp
|
4 years ago |
|
sunyuchao
|
cc7b97f37c
|
列表网格名拼接到上两级组织名称，恶心人的玩意
|
4 years ago |
|
zxc
|
0445ece155
|
Merge branch 'dev_grid_patrol' into dev_temp
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
4 years ago |
|
wxz
|
cb1d7ef28f
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
422f15f71e
|
调整操作日志接口返回时间戳单位为秒
|
4 years ago |
|
zxc
|
52f8afb276
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
28795cfd31
|
分类修改
|
4 years ago |
|
zxc
|
0f6a9e12a7
|
大屏巡查
|
4 years ago |
|
wxz
|
cbc75d2c03
|
Merge branch 'dev_log' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
|
4 years ago |
|
wxz
|
f9a344633e
|
调整auth-client层级关系
|
4 years ago |
|
wxz
|
8d0ce728b8
|
-
|
4 years ago |
|
wxz
|
eb4414f48f
|
Merge branch 'dev_log' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
|
4 years ago |
|
wxz
|
39d1645fe3
|
项目变动ddl修改
|
4 years ago |
|
wxz
|
3cb8dbc460
|
项目变动增加日志，补充提交
|
4 years ago |
|
jianjun
|
f569b3adcd
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_patrol
|
4 years ago |
|
wxz
|
2176562b56
|
项目变动增加日志完成
|
4 years ago |
|
jianjun
|
135936f874
|
修改网格中心点时去掉 参数里的委会
|
4 years ago |
|
sunyuchao
|
5f90043f70
|
Merge branch 'dev_project_location' into dev_temp
|
4 years ago |
|
sunyuchao
|
3f39233214
|
取值错误修改
|
4 years ago |
