 liwen
|
1891c92b14
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
4 months ago |
|
liwen
|
43ae7e8cad
|
fix: 解决维保记录结束时间查询报错的问题
|
4 months ago |
 ty
|
a25ee54511
|
修正：缺陷流程入库失败代码修正
|
4 months ago |
 Jone
|
f75d5a9d7c
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
# Conflicts:
# hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/PresonManagementController.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java
|
4 months ago |
 haungxing
|
9ea4cc62f3
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
Jone
|
55bae1eccd
|
删除System.out.println 的代码
|
4 months ago |
|
liwen
|
809aad8d3e
|
fix: 解决安全工器具扫描导出的二维码报错的问题
|
4 months ago |
|
liwen
|
76a0202bb9
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
4 months ago |
|
liwen
|
51b563a0ec
|
fix: 解决物资库存台账的页面异常问题
|
4 months ago |
|
ty
|
26045b19eb
|
修正：缺陷流程initResult去除转移符
|
4 months ago |
|
ty
|
f92cd2a48a
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
 yang_shj
|
5c87898d74
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
4aff400b38
|
#新版告警修改
|
4 months ago |
|
liwen
|
c40da0adc2
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
4 months ago |
|
liwen
|
9385780912
|
fix: 解决设备生命周期中运行台账页面的报错问题
|
4 months ago |
|
yang_shj
|
850fed5d6a
|
#水电站点首页接口优化
|
4 months ago |
|
yang_shj
|
a98da57a75
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
6bf30636bd
|
#水电站点首页接口优化
|
4 months ago |
|
liwen
|
eff6959589
|
fix: 解决我的巡检任务中机构条件查询失效的问题
|
4 months ago |
|
liwen
|
799370b3c0
|
fix: 解决巡检项目管理条件查询失效的问题
|
4 months ago |
|
ty
|
03f1d5ab70
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
b0cfa75a98
|
修正：证书管理依赖调整
|
4 months ago |
|
haungxing
|
a1a0ec76fc
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
4bc1403afa
|
fix:巡检报备限制状态判断
(cherry picked from commit 9bf35972120fffaad41ad4719ea21ecb6034a51b)
|
4 months ago |
|
yang_shj
|
6a4ed31bb1
|
#新版电站首页
|
4 months ago |
|
yang_shj
|
79264d7985
|
#新版电站首页
|
4 months ago |
|
liwen
|
903e6ab50c
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
liwen
|
8f79ca942d
|
fix: 工作票导出勾选图标异常问题
|
4 months ago |
|
yang_shj
|
4db085ff1f
|
#新版电站页面修改
|
4 months ago |
|
yang_shj
|
3c749f06b5
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
liwen
|
889c3110e3
|
fix: 工作票导出勾选图标异常问题
|
4 months ago |
|
ty
|
7192116dc2
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
d839a0ec1e
|
修正：巡检任务统计丢失精度问题
|
4 months ago |
|
haungxing
|
64628cfa4a
|
fix：巡检报备无法执行任务bug修复
|
4 months ago |
|
haungxing
|
8c80d96ab4
|
fix：巡检对象人员列表修改获取用户名称逻辑
|
4 months ago |
|
haungxing
|
bd8f7a75c3
|
add：日常维护计划查询新增站点条件查询
|
4 months ago |
|
yang_shj
|
ee40d4a132
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-5.1.3
# Conflicts:
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
# pom.xml
|
4 months ago |
|
yang_shj
|
32c08e1123
|
#新版电站页面修改
|
4 months ago |
|
haungxing
|
b511cdf1b1
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
37d9193799
|
# 设备定义无法新增bug解决
|
4 months ago |
|
ty
|
8d69d189c0
|
修正：补偿流程逻辑优化
|
4 months ago |
|
ty
|
d89794d31a
|
修正：运行日志报错提示词
|
4 months ago |
|
ty
|
ccad4b1d74
|
修正：补偿工作流的params转换逻辑
|
4 months ago |
|
ty
|
ada422ee28
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
dbe9b41b6d
|
修正：补偿工作流的params转换逻辑
|
4 months ago |
|
yang_shj
|
d5a2be1773
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
e8e720800d
|
#新版告警修改
|
4 months ago |
|
ty
|
c85e25babb
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
2c881e0417
|
调整：调整告警消息推送顺序
|
4 months ago |
|
yang_shj
|
63b310d47d
|
#新版告警修改
|
4 months ago |
