 yang_shj
|
e8d1be1e77
|
#代码修改
|
1 year ago |
|
yang_shj
|
54896c960e
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
|
1 year ago |
 haungxing
|
6af13e2754
|
# 统计月报bug修改
|
1 year ago |
|
yang_shj
|
16a68c5ec2
|
#离线代码还原
|
1 year ago |
|
yang_shj
|
ba30f4f9cb
|
#启动图标
|
1 year ago |
|
yang_shj
|
fc2493493d
|
#代码回退
|
1 year ago |
|
yang_shj
|
459aa778c0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java
|
1 year ago |
|
yang_shj
|
e8199b3f2d
|
#代码回退
|
1 year ago |
tyty
|
12eaea0c34
|
Merge remote-tracking branch 'origin/master20230901'
|
1 year ago |
|
tyty
|
aafd3cdee5
|
revert add text.text
|
1 year ago |
|
yang_shj
|
5f8a72c2d9
|
#霍山生产管理修改
|
1 year ago |
|
tyty
|
9dd29d440d
|
修改统计月报-个人bug
|
1 year ago |
|
tyty
|
023c76fdf7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
tyty
|
9bda3a6ab5
|
Revert "#离线修改"
This reverts commit f7b213e3b6.
|
1 year ago |
|
tyty
|
e63376574d
|
Revert "#离线修改"
This reverts commit f7b213e3b6.
|
1 year ago |
|
yang_shj
|
4dd3a1433e
|
#离线修改
|
1 year ago |
|
yang_shj
|
0833377976
|
#离线修改
|
1 year ago |
|
yang_shj
|
75ca93c2ba
|
Merge remote-tracking branch 'origin/huoshan'
# Conflicts:
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java
|
1 year ago |
|
yang_shj
|
18cc2ea1b8
|
Merge remote-tracking branch 'origin/huoshan' into huoshan
|
1 year ago |
|
yang_shj
|
f7b213e3b6
|
#离线修改
|
1 year ago |
|
zhaiqm
|
5998b4a846
|
@作业区域管理@翟千民
|
1 year ago |
|
yang_shj
|
dc40eb3e23
|
Merge remote-tracking branch 'origin/huoshan' into huoshan
|
1 year ago |
|
yang_shj
|
b726697e56
|
#智能生产修改
|
1 year ago |
|
yang_shj
|
f54321acba
|
#定时任务修改
|
1 year ago |
|
yang_shj
|
86ad2d8fb7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
ad71a6a5a7
|
#流程bug
|
1 year ago |
|
haungxing
|
716cbe6e1b
|
# 日常维护生成任务bug修改
# 巡检任务派发任务过期任务未置为未完成状态
# 巡检内容定义筛选条件过滤补充
|
1 year ago |
|
zhaiqm
|
ada7c67e93
|
@不安全行为管理@翟千民
|
1 year ago |
|
zhaiqm
|
4248245ce4
|
@电站运行数据@翟千民
|
1 year ago |
|
haungxing
|
b6324254c1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
0efac9e1a2
|
#流程bug
|
1 year ago |
|
haungxing
|
87024d1c19
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
2dcacd70d6
|
#流程bug
|
1 year ago |
|
yang_shj
|
333347464a
|
Merge remote-tracking branch 'origin/huoshan' into huoshan
|
1 year ago |
|
yang_shj
|
b33f28ba2a
|
#新区域值班数据统计
|
1 year ago |
|
段飞宇
|
6108e81fef
|
新建water-rain模块
|
1 year ago |
|
段飞宇
|
865b70121c
|
新建water-quality模块
|
1 year ago |
|
yang_shj
|
409fef4c55
|
#工作台修改
|
1 year ago |
|
yang_shj
|
b3403c2f88
|
Merge remote-tracking branch 'origin/huoshan' into huoshan
|
1 year ago |
|
yang_shj
|
18c5378d9a
|
#新区域值班统计
|
1 year ago |
|
段飞宇
|
b39447c854
|
新建video-image模块
|
1 year ago |
|
段飞宇
|
1c272c440e
|
新建dam-safety模块
|
1 year ago |
|
yang_shj
|
2118798f5f
|
#智能预警过滤
|
1 year ago |
|
段飞宇
|
f1ef0d382c
|
三维巡检接口
|
1 year ago |
|
haungxing
|
f62181a93a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
17b2661a6e
|
#巡检内容bug修改
|
1 year ago |
|
haungxing
|
050c65ee2b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
haungxing
|
6b63ad594b
|
# 两票接口优化
|
1 year ago |
|
yang_shj
|
676dd5f42b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
9be1542c22
|
#微信消息推送&巡检内容bug修改
|
1 year ago |
