 yang_shj
|
77c7a77bfe
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
|
3 years ago |
|
yang_shj
|
806785f8e5
|
#水电站优化
|
3 years ago |
tyty
|
e8c0e55b7e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
tyty
|
d4500ecb83
|
修复排班-灵活排班模板相关逻辑
|
3 years ago |
 haungxing
|
d568a13497
|
# 计划推送消息接口修改
|
3 years ago |
|
haungxing
|
5b3ad74f12
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
1cf980f5e4
|
# 计划推送消息接口修改
|
3 years ago |
|
段飞宇
|
9df9761fc8
|
完善日常维护计划巡检任务
|
3 years ago |
|
haungxing
|
dacdb3c68b
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
34b1d1fc34
|
# 计划推送消息接口修改
|
3 years ago |
|
tyty
|
bad4eec4d9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
tyty
|
605c5d7776
|
修正排班-灵活相关逻辑bug
|
3 years ago |
|
haungxing
|
00f4926e66
|
# 巡检任务生成消息推送修改
|
3 years ago |
|
haungxing
|
db0b8620e1
|
# 巡检任务生成消息推送aop bug
|
3 years ago |
|
haungxing
|
9d51a3e05e
|
# 巡检消息推送
# 消息API修改
|
3 years ago |
|
haungxing
|
95571d461d
|
# 消息推送接口修改
|
3 years ago |
|
haungxing
|
f0f699e3b5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
5262809e4b
|
# 消息推送接口修改
|
3 years ago |
|
段飞宇
|
2d5d304c8e
|
修改操作票
|
3 years ago |
|
段飞宇
|
0155980c6d
|
日常维护，安全工具器短信推送
|
3 years ago |
|
haungxing
|
895c9f19af
|
# 接口批量已读
|
3 years ago |
|
haungxing
|
3206464a2d
|
# 接口批量已读
|
3 years ago |
|
haungxing
|
dfddc079dd
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
9522c6c0e6
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
c045471de3
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
c304111c84
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
dd8048f17e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
01d918e7b9
|
# 计划类型消息推送接口修改
|
3 years ago |
|
yang_shj
|
b899d3016e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yang_shj
|
627812299d
|
#等级告警
|
3 years ago |
|
haungxing
|
90f298bf77
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
93193a5703
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
49dac3aa19
|
# 计划类型消息推送接口修改
|
3 years ago |
|
haungxing
|
20921c3e56
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
82415a9338
|
# 日常维护消息推送接口修改
|
3 years ago |
|
yang_shj
|
963c16aea2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yang_shj
|
b7d98e3237
|
#告警websocket
|
3 years ago |
|
haungxing
|
8fb7d5f580
|
# 消息推送获取未读消息bug处理
|
3 years ago |
|
haungxing
|
dc51537716
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
haungxing
|
9433906785
|
# 站点删除接口调整
|
3 years ago |
|
段飞宇
|
82e77e00b1
|
完善水电生成报告详情数据 工作票 操作票
|
3 years ago |
|
tyty
|
d54fbcb043
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
tyty
|
3e400fd2a5
|
修正排班计划相关代码
|
3 years ago |
|
yang_shj
|
54f6ea559c
|
#告警websocket
|
3 years ago |
|
yang_shj
|
e0e5c3a4ae
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yang_shj
|
51bec2b141
|
#集中监控websocket修改
|
3 years ago |
|
段飞宇
|
3974893d83
|
删除所属机构信息
|
3 years ago |
|
haungxing
|
8408576520
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yang_shj
|
b8e7c2d641
|
#集中监控修改
|
3 years ago |
|
haungxing
|
ccd9bf372f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
