|
|
9656de38e7
|
修复mysql不支持09-31
|
2025-09-04 11:32:57 +08:00 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
5b678c3ee1
|
bug修复和mysql批量替换值
|
2025-08-30 18:12:22 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
cdd918d0ef
|
bug修复
|
2025-08-28 16:49:47 +08:00 |
|
|
|
9474d49433
|
Merge branch 'mod_security' into prod
|
2025-08-27 18:23:11 +08:00 |
|
|
|
afdea2e5bb
|
bug修复
|
2025-08-27 17:47:11 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
38c35543a0
|
Merge branch 'mod_security' into prod
|
2025-08-26 21:23:12 +08:00 |
|
|
|
c9747cfbef
|
bug修复
|
2025-08-26 19:29:39 +08:00 |
|
|
|
ffe6fe38a9
|
bug修复
|
2025-08-26 09:14:03 +08:00 |
|
|
|
686420e7d2
|
青海中水北方修改
|
2025-08-25 15:32:29 +08:00 |
|
|
|
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 |
|
|
|
7a4acb5a45
|
智能安全帽人员每日工作统计相关和bug修改
|
2025-08-16 18:21:28 +08:00 |
|
|
|
af7fb5f8f9
|
修改bug
|
2025-08-15 09:04:14 +08:00 |
|
|
|
0cf0c64722
|
修改bug
|
2025-08-13 11:43:02 +08:00 |
|
|
|
58d316bcb9
|
安全修改bug
|
2025-08-08 18:34:14 +08:00 |
|
|
|
0dc7d79eaa
|
安全bug修复
|
2025-08-07 14:11:29 +08:00 |
|
|
|
d87e8aa639
|
安全隐患检查字段设置配置、隐患统计分析接口
|
2025-08-07 11:35:46 +08:00 |
|
|
|
1fceef032c
|
安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口
|
2025-08-05 13:57:09 +08:00 |
|
|
|
6652fbeaa6
|
安全隐患检查字段设置和安全隐患复查核验人设置
|
2025-08-04 11:57:56 +08:00 |
|
|
|
88a34da4bb
|
通知提示音信息bug修复
|
2025-08-02 09:16:03 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
b178980110
|
ICC的数据校验
|
2025-07-29 10:03:02 +08:00 |
|
|
|
60a4832eef
|
icc的错误重试
|
2025-07-25 09:46:49 +08:00 |
|
|
|
5641225773
|
Merge branch 'icc' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-07-24 10:35:10 +08:00 |
|
|
|
41d32bbda2
|
管控bug修改
|
2025-07-22 18:08:32 +08:00 |
|
|
|
6e0f08bfa9
|
人脸设备对接
|
2025-07-21 10:44:43 +08:00 |
|
|
|
c04d785c5f
|
管控bug修改
|
2025-07-21 10:42:03 +08:00 |
|
|
|
f394535531
|
icc的劳务人员对接修改
|
2025-07-19 11:04:52 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
6a2706a31c
|
测试推送新git仓库
|
2025-05-29 17:10:36 +08:00 |
|
|
|
50532d993b
|
模拟数据生成
|
2025-05-29 09:13:04 +08:00 |
|
|
|
4a1f52465c
|
模拟数据生成
|
2025-05-28 09:57:12 +08:00 |
|
|
|
de02477417
|
木垒安全管理调整
|
2024-10-26 17:46:14 +08:00 |
|
|
|
bff0d84786
|
bug修复
|
2024-09-05 17:44:32 +08:00 |
|
|
|
956b934144
|
Revert "angang修改 合并"
This reverts commit ff2f335a
|
2024-09-05 17:40:44 +08:00 |
|
|
|
ff2f335ae5
|
angang修改 合并
|
2024-08-24 14:18:57 +08:00 |
|
|
|
8775bbda96
|
保存星纵-应急-推送信息bug修复
|
2024-08-08 17:25:44 +08:00 |
|
|
|
65aaaee65d
|
安全隐患扣分改成选择一个违章人员扣分
|
2024-08-08 17:24:58 +08:00 |
|
|
|
8850c3c833
|
应急报警bug修复
|
2024-08-07 17:42:52 +08:00 |
|
|
|
3a5d30950c
|
bug修复
|
2024-08-05 10:08:07 +08:00 |
|
|
|
7b0a7e8aaa
|
资质文件的资质类型的（安全协议、劳务分包合同、施工合同必须都要上传
|
2024-08-02 21:22:45 +08:00 |
|
|
|
63e697627c
|
大屏评分bug修改
|
2024-08-02 21:20:21 +08:00 |
|
|
|
5549fe4386
|
全部整改记录中通过安全问题库进行筛选隐患
|
2024-08-02 21:20:15 +08:00 |
|
|
|
afb685614e
|
安全检查库排序
|
2024-08-02 09:33:06 +08:00 |
|
|
|
7136eddf32
|
大屏评分bug修改
|
2024-08-01 17:32:12 +08:00 |
|
|
|
410e2be414
|
保存日志加上前后变化的数据
|
2024-08-01 17:32:05 +08:00 |
|
