 yang_shj
|
494257283a
|
Merge remote-tracking branch 'origin/prod-20240506'
# Conflicts:
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneTemplateService.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneTemplateServiceImpl.java
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
# hzims-service/safeproduct/src/main/resources/db/2.0.1.sql
# pom.xml
|
6 months ago |
 haungxing
|
c414f10227
|
add:历史数据查询
|
6 months ago |
|
yang_shj
|
5b0cb49670
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
d8f6d9aa26
|
#用户反馈
|
6 months ago |
 liwen
|
150670b0cf
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
6 months ago |
 ty
|
aee95af2b6
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
ty
|
c8f667a827
|
修正：告警处理记录中的处理人字段
|
6 months ago |
|
haungxing
|
e0b766cd3b
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
haungxing
|
0060d8446c
|
add:历史数据查询
|
6 months ago |
|
yang_shj
|
af8b1c4389
|
#水电站月报发电量小数问题
|
6 months ago |
|
liwen
|
03ecbafe44
|
update: 卫生自查模板详情表字段修改
|
6 months ago |
|
liwen
|
da0c28467a
|
update: 考试记录及格分设置
|
6 months ago |
|
liwen
|
3b2fe257ec
|
update: 卫生自查模板详情表字段修改
|
6 months ago |
|
liwen
|
b601dd36e1
|
update: 卫生自查更新
|
6 months ago |
|
liwen
|
9d5461c38f
|
update: 卫生自查模块
|
6 months ago |
|
liwen
|
bee5de26b8
|
update: 卫生自查模板
|
6 months ago |
|
liwen
|
52ffb6052a
|
add: 车检记录模板
|
6 months ago |
|
ty
|
5e2ab79d97
|
修改：微信公众号推送字数限制在20
|
6 months ago |
|
liwen
|
b3cbe8b30a
|
update: 卫生自查更新
|
6 months ago |
|
yang_shj
|
97b1ee2201
|
#水电站运行月报
|
6 months ago |
|
yang_shj
|
e0a898c3d5
|
#水电站运行月报
|
6 months ago |
|
yang_shj
|
aac30665c7
|
#水电站运行月报
|
6 months ago |
|
ty
|
85c5c269c5
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
ty
|
ced0ef7867
|
新增：线下操作票流程
|
6 months ago |
|
yang_shj
|
bc4fde238c
|
#水电站运行月报
|
6 months ago |
|
liwen
|
bcc6592d35
|
update: 卫生自查模块
|
6 months ago |
|
yang_shj
|
2f0e8716db
|
#水电站运行月报
|
6 months ago |
|
liwen
|
d66187c40c
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
6 months ago |
|
liwen
|
2718da82c9
|
update: message服务pom文件
|
6 months ago |
|
liwen
|
c8dcd99502
|
update: 卫生自查模板
|
6 months ago |
|
yang_shj
|
afbab4cc47
|
#填报发电量保存
|
6 months ago |
|
yang_shj
|
a89fb5ea8e
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
yang_shj
|
3f0e049e33
|
#大模型发电量
|
6 months ago |
|
haungxing
|
ce28eac1b6
|
add:站点数量统计
|
6 months ago |
|
yang_shj
|
eb8d326b6c
|
#大模型发电量
|
6 months ago |
|
yang_shj
|
b8ad77fa36
|
#大模型发电量
|
6 months ago |
|
haungxing
|
4eb705f531
|
add:站点数量统计
|
6 months ago |
|
haungxing
|
b74c3296c3
|
add:站点数量统计
|
6 months ago |
|
haungxing
|
a5ca29bbcb
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
yang_shj
|
90b431a7b3
|
#大模型发电量
|
6 months ago |
|
haungxing
|
b12bbcf42a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/controller/InteractiveController.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
|
6 months ago |
|
haungxing
|
1c0aec87e2
|
add:站点数量统计
|
6 months ago |
|
yang_shj
|
3b2f2da88c
|
#大模型发电量
|
6 months ago |
|
yang_shj
|
4c1eb9c1d2
|
#大模型发电量修改
|
6 months ago |
|
yang_shj
|
216913c25a
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
yang_shj
|
323b16b580
|
#站点接口优化
|
6 months ago |
|
haungxing
|
8252fcf39a
|
add:安全工器具二维码模板
|
6 months ago |
|
haungxing
|
90f352d987
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
haungxing
|
3e3fac67ae
|
fix:实时数据时间查询格式化
|
6 months ago |
|
yang_shj
|
791f2ffdfc
|
#水电站运行月报生成接口
|
6 months ago |
