 Jone
|
bcce380d27
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
Jone
|
72e7b5e76c
|
修复不规范的代码
|
4 months ago |
 haungxing
|
e000daa790
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
09352a6ccc
|
fix: 合并master分支
|
4 months ago |
|
haungxing
|
e3313a099a
|
fix: 合并master分支
|
4 months ago |
 ty
|
8a578ae500
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
74f119bfdf
|
修复:巡检任务统计保留两位小数
|
4 months ago |
 yang_shj
|
d232690c38
|
#风险评估默认状态
|
4 months ago |
|
yang_shj
|
b1f05edd5e
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
93c13d394c
|
#日志打印修改
|
4 months ago |
|
ty
|
0e8cf93ac0
|
修复:导出非空判断
|
4 months ago |
|
ty
|
547cf9eb5d
|
修复:智能诊断状态修改时，增加创建用户
|
4 months ago |
|
haungxing
|
8e058885f9
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
deec08f8f4
|
fix: 工作票添加站点机构筛选条件
|
4 months ago |
|
yang_shj
|
fb0a77b92f
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
23eb635e97
|
#文件命名冲突
|
4 months ago |
|
haungxing
|
804ad760c8
|
fix: 工作票站点机构筛选
|
4 months ago |
|
haungxing
|
aa19f555c6
|
fix: 离线巡检任务查看详情报错问题
|
4 months ago |
|
haungxing
|
5a639d31b0
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
ab491d0682
|
fix: 调拨单、工具领用导出接口
|
4 months ago |
|
ty
|
c0a8ae19c6
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
0d06667bb9
|
修复：水电站生产月报图片大小
|
4 months ago |
|
yang_shj
|
a9d5521efc
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
2680202ac7
|
#安全管理功能&bug解决
|
4 months ago |
 liwen
|
c846ca4a6a
|
fix: 解决培训管理成绩单及格率计算错误的问题
|
4 months ago |
|
ty
|
ecb881825d
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
7e5a31c091
|
修复：生产月报增加非空判断
|
4 months ago |
|
haungxing
|
524393ca5d
|
fix: 大模型controller层重命名
|
4 months ago |
|
haungxing
|
a575c3b6a1
|
fix: 修复APP点击进入设备档案报错问题
|
4 months ago |
|
haungxing
|
724e1de145
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
06727dc08c
|
fix: 修复巡检本站月报导出失败问题
|
4 months ago |
|
yang_shj
|
f434a20a47
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
40e9e4aa4e
|
#安全管理功能
|
4 months ago |
|
haungxing
|
2a029ebbbb
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
8aef0a14e6
|
fix: 资产管理入库单导出接口修改
|
4 months ago |
|
ty
|
d41195227c
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
002cc7ec37
|
fix: 工具领用导出接口
|
4 months ago |
|
liwen
|
edfd1006d0
|
add: 新增入库单导出接口
|
4 months ago |
|
ty
|
c048f619a2
|
修复：隐患流程修复
|
4 months ago |
|
liwen
|
01dfccab9b
|
fix: 解决年度里程统计导出报错的问题
|
4 months ago |
|
ty
|
d8c4faec7d
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
5a3c04d294
|
修复：智能诊断页面查询增加用户权限
|
4 months ago |
|
haungxing
|
7e07d9b381
|
fix:体系文件保存报错问题解决
fix：日常维护记录添加站点编号筛选条件
fix：隐患排查计划详情查询负责人名称添加
fix：巡检路径新增提出无法使用的巡检模板选择
fix：设备定义保存报错问题解决
|
4 months ago |
|
haungxing
|
59ab838c20
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
liwen
|
2f9a9435ee
|
fix: 解决会议记录查询结果异常的问题
|
4 months ago |
|
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 |
