|
|
9e49c6f7bc
|
优化权限和bug修复
|
2025-09-10 20:26:17 +08:00 |
|
|
|
48f41ef72a
|
广播和视频分组导入
|
2025-09-08 17:04:43 +08:00 |
|
|
|
b679c12c48
|
bug修复
|
2025-09-05 11:39:47 +08:00 |
|
|
|
8f7a2c206e
|
bug修复
|
2025-09-05 11:29:57 +08:00 |
|
|
|
d407d558af
|
广播接口和bug修复
|
2025-09-04 17:58:29 +08:00 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
328d0371c0
|
青海中水北方修改
|
2025-08-25 17:26:59 +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 |
|
|
|
4ea32fd92d
|
bug修改
|
2025-08-15 18:45:55 +08:00 |
|
|
|
933b8012be
|
修改bug
|
2025-08-14 14:45:23 +08:00 |
|
|
|
88a34da4bb
|
通知提示音信息bug修复
|
2025-08-02 09:16:03 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
d0a5adc391
|
mcs8的bug修改
|
2025-07-25 10:35:52 +08:00 |
|
|
|
d187dfe6d8
|
删除多余字段
|
2025-07-24 10:59:01 +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 |
|
|
|
87f312ee98
|
icc的对接bug修改
|
2025-07-24 09:44:58 +08:00 |
|
|
|
97c134b227
|
Merge branch 'xjw_attendance' into prod
|
2025-07-23 14:52:32 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
7dfee323ee
|
企业大屏配置和修改
|
2025-07-16 09:08:34 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
8d734b46f7
|
Merge branch 'xjw_attendance' into prod
|
2025-07-12 09:56:18 +08:00 |
|
|
|
389ffcd285
|
中水北方修改
|
2025-07-11 18:18:24 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
9fc9d4e4ac
|
芊熠智能bug修复
|
2025-07-03 14:59:48 +08:00 |
|
|
|
65338aecc9
|
对接小萨塔吊
|
2025-06-30 15:09:10 +08:00 |
|
|
|
3c07e9e6a0
|
基建项目
|
2025-05-29 15:24:17 +08:00 |
|
|
|
02315459dd
|
标准版优化
|
2025-05-12 09:05:30 +08:00 |
|
|
|
6e8b06cd93
|
AI功能
|
2025-04-11 17:30:52 +08:00 |
|
|
|
a76a022cfd
|
弹弓人脸
|
2025-03-18 09:55:24 +08:00 |
|
|
|
1e0c93c0c7
|
上海电力人员定位
|
2025-03-14 10:27:27 +08:00 |
|
|
|
4806ed1b60
|
盾构机管理
|
2025-02-18 16:16:53 +08:00 |
|
|
|
78924866cb
|
移动考勤
|
2024-12-03 11:18:00 +08:00 |
|
|
|
956b934144
|
Revert "angang修改 合并"
This reverts commit ff2f335a
|
2024-09-05 17:40:44 +08:00 |
|
|
|
91e3b13e7f
|
人员定位统计
|
2024-09-05 17:02:08 +08:00 |
|
|
|
7969ec5309
|
增加人员定位统计
|
2024-09-05 11:36:03 +08:00 |
|
|
|
fcb45af0ea
|
增加人员定位统计
|
2024-09-05 10:45:09 +08:00 |
|
|
|
6189648127
|
鞍钢-bug修复
|
2024-08-28 18:39:24 +08:00 |
|
|
|
ff2f335ae5
|
angang修改 合并
|
2024-08-24 14:18:57 +08:00 |
|
|
|
410e2be414
|
保存日志加上前后变化的数据
|
2024-08-01 17:32:05 +08:00 |
|
|
|
fcb51e52ba
|
现场大屏弹幕和现场大屏节目单管理
|
2024-07-11 18:27:36 +08:00 |
|
|
|
6f1b7030c8
|
代码规范
|
2024-07-11 16:18:15 +08:00 |
|
|
|
d379b76f14
|
代码规范
|
2024-07-11 11:56:16 +08:00 |
|
|
|
021a87fabf
|
代码加注释
|
2024-07-10 09:41:45 +08:00 |
|
|
|
dcd8fffe09
|
代码规范
|
2024-07-09 16:42:03 +08:00 |
|
|
|
86e8761cf5
|
bug修改和代码规范
|
2024-07-09 11:07:16 +08:00 |
|
|
|
8a827ecd50
|
bug修改和代码规范
|
2024-07-08 19:06:04 +08:00 |
|
