|
|
ca6f3100e1
|
bug修复
|
2025-08-22 14:39:56 +08:00 |
|
|
|
5b4b8a811c
|
Merge branch 'prod' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
|
2025-08-21 18:56:44 +08:00 |
|
|
|
d015d534f1
|
bug修复
|
2025-08-21 18:53:35 +08:00 |
|
|
|
933f6ebb41
|
bug修复
|
2025-08-21 17:51:23 +08:00 |
|
|
|
e6ae6c94e0
|
人员退场设置和bug修复
|
2025-08-21 09:21:15 +08:00 |
|
|
|
31d2d1bdf2
|
bug修改
|
2025-08-20 15:28:47 +08:00 |
|
|
|
7a4acb5a45
|
智能安全帽人员每日工作统计相关和bug修改
|
2025-08-16 18:21:28 +08:00 |
|
|
|
4ea32fd92d
|
bug修改
|
2025-08-15 18:45:55 +08:00 |
|
|
|
9495b5cb45
|
劳务管理人员审核通过bug修改
|
2025-08-15 16:48:38 +08:00 |
|
|
|
f3320a0587
|
劳务管理人员审核通过bug修改
|
2025-08-15 16:46:25 +08:00 |
|
|
|
af7fb5f8f9
|
修改bug
|
2025-08-15 09:04:14 +08:00 |
|
|
|
933b8012be
|
修改bug
|
2025-08-14 14:45:23 +08:00 |
|
|
|
72d55cd321
|
扬尘增加蒸发量
|
2025-08-14 10:11:16 +08:00 |
|
|
|
3663e7d5d2
|
修改bug
|
2025-08-14 09:12:17 +08:00 |
|
|
|
4d1938005f
|
修改bug
|
2025-08-13 11:43:40 +08:00 |
|
|
|
0cf0c64722
|
修改bug
|
2025-08-13 11:43:02 +08:00 |
|
|
|
8135452f87
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-12 17:14:07 +08:00 |
|
|
|
5101d248a5
|
仁智测控转发扬尘Hj212集成
|
2025-08-12 17:14:01 +08:00 |
|
|
|
dc37ecc9b2
|
正赢增加人脸心跳检测
|
2025-08-12 10:55:57 +08:00 |
|
|
|
6ad362778a
|
正赢增加人脸心跳检测
|
2025-08-12 09:41:20 +08:00 |
|
|
|
8ff888f270
|
icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间
|
2025-08-12 09:25:50 +08:00 |
|
|
|
58d316bcb9
|
安全修改bug
|
2025-08-08 18:34:14 +08:00 |
|
|
|
f6880f49df
|
配置调整
|
2025-08-08 10:22:37 +08:00 |
|
|
|
f03f122aac
|
管控清单危险源绑定的的责任区域改成中间表方式
|
2025-08-07 18:02:33 +08:00 |
|
|
|
0dc7d79eaa
|
安全bug修复
|
2025-08-07 14:11:29 +08:00 |
|
|
|
d87e8aa639
|
安全隐患检查字段设置配置、隐患统计分析接口
|
2025-08-07 11:35:46 +08:00 |
|
|
|
4ef2006812
|
配置调整
|
2025-08-07 11:34:56 +08:00 |
|
|
|
ecaaf0cdc2
|
配置调整
|
2025-08-07 11:33:01 +08:00 |
|
|
|
b9582da9d9
|
Merge remote-tracking branch 'origin/mod_security' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
|
2025-08-05 15:31:02 +08:00 |
|
|
|
0b0dfa754b
|
Merge branch 'uat' into mod_security
|
2025-08-05 15:23:20 +08:00 |
|
|
|
87ed00d464
|
SmartJavaAIOcr的bug修改
|
2025-08-05 15:19:57 +08:00 |
|
|
|
73a2fc37b2
|
SmartJavaAIOrc的bug修改
|
2025-08-05 15:18:40 +08:00 |
|
|
|
1fceef032c
|
安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口
|
2025-08-05 13:57:09 +08:00 |
|
|
|
098bb63b31
|
执法记录仪设备生成二维码保存格式改成devSn
|
2025-08-04 14:22:21 +08:00 |
|
|
|
6652fbeaa6
|
安全隐患检查字段设置和安全隐患复查核验人设置
|
2025-08-04 11:57:56 +08:00 |
|
|
|
369847e9d3
|
接入SmartJavaAIOrc
|
2025-08-04 11:34:57 +08:00 |
|
|
|
395d2a1617
|
Merge branch 'ocr' into uat
|
2025-08-04 09:30:06 +08:00 |
|
|
|
88a34da4bb
|
通知提示音信息bug修复
|
2025-08-02 09:16:03 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
b256bf7729
|
ocr和施工日志bug修复
|
2025-07-30 15:45:16 +08:00 |
|
|
|
e7eef4e308
|
环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复
|
2025-07-30 15:17:28 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
b178980110
|
ICC的数据校验
|
2025-07-29 10:03:02 +08:00 |
|
|
|
73370c8af0
|
ocr和施工日志bug修改
|
2025-07-25 18:20:39 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
63eea7c798
|
icc修改bug
|
2025-07-25 15:53:37 +08:00 |
|
|
|
0f21141944
|
icc修改bug
|
2025-07-25 15:53:00 +08:00 |
|
|
|
abdb7e04c1
|
查询各个区域下在场人数优化
|
2025-07-25 15:08:42 +08:00 |
|
|
|
33b000f90c
|
map改成对象
|
2025-07-25 15:08:22 +08:00 |
|
|
|
8926a006da
|
map改成对象
|
2025-07-25 15:07:56 +08:00 |
|
