|
|
8be282781f
|
Merge branch 'mod_security' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
|
2025-09-04 11:36:54 +08:00 |
|
|
|
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 |
|
|
|
016ba73419
|
Merge branch 'prod' into mod_security
|
2025-09-02 13:56:51 +08:00 |
|
|
|
24b469a92b
|
考勤月报-按单位，最多导出41天
|
2025-09-02 10:48:41 +08:00 |
|
|
|
5b678c3ee1
|
bug修复和mysql批量替换值
|
2025-08-30 18:12:22 +08:00 |
|
|
|
a2ed0c329d
|
Merge branch 'mod_security' into prod
|
2025-08-30 17:05:30 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
ab8c736792
|
扬尘增加蒸发量文档
|
2025-08-29 15:29:18 +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 |
|
|
|
1bead9cf22
|
bug修复
|
2025-08-27 18:16:03 +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 |
|
|
|
328d0371c0
|
青海中水北方修改
|
2025-08-25 17:26:59 +08:00 |
|
|
|
98858b3b48
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 15:32:43 +08:00 |
|
|
|
686420e7d2
|
青海中水北方修改
|
2025-08-25 15:32:29 +08:00 |
|
|
|
8377079917
|
查询慢优化
|
2025-08-25 15:13:06 +08:00 |
|
|
|
fbf14e2502
|
查询慢优化
|
2025-08-25 15:12:24 +08:00 |
|
|
|
ee98e443e9
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 11:46:53 +08:00 |
|
|
|
6eb8ccdd72
|
青海中水北方修改
|
2025-08-25 11:44:27 +08:00 |
|
|
|
2bdd14aec2
|
bug修复
|
2025-08-22 19:47:15 +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 |
|
|
|
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 |
|
|
|
cfd227d1ef
|
打印
|
2025-08-13 17:41:38 +08:00 |
|
|
|
e0b1e446e6
|
uat合并prod
|
2025-08-13 16:00:38 +08:00 |
|
|
|
4a4409c62e
|
Merge branch 'prod' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
|
2025-08-13 15:50:38 +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 |
|
