129 Commits

Author SHA1 Message Date
dd2b19626c 优化权限 2025-09-12 14:29:08 +08:00
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
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
b05f69ebca 人脸设备对接 2025-07-31 11:07:51 +08:00
ccf93552c0 短信配置 2025-07-29 18:17:51 +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
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
389ffcd285 中水北方修改 2025-07-11 18:18:24 +08:00
9fc9d4e4ac 芊熠智能bug修复 2025-07-03 14:59:48 +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
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
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
a02b582806 日志bug修改和代码规范 2024-07-08 14:27:32 +08:00
8c4e820c73 代码规范 2024-07-03 16:11:21 +08:00
8a8bb8fed4 红黄绿码修改 2024-06-27 11:07:54 +08:00
b6f81d98a8 bug修复 2024-06-21 19:19:37 +08:00
GUO
6fc496adda 审批流通知发起人 2024-06-17 23:43:19 +08:00
004dcc5f43 大屏接口 2024-06-17 23:12:48 +08:00
GUO
0ac45efb65 海康下发修改 2024-06-16 19:20:50 +08:00
GUO
9677938533 海康下发修改 2024-06-16 13:36:40 +08:00
576f600850 下发设备修改 2024-06-16 12:09:47 +08:00
GUO
e003e303e1 海康下发修改 2024-06-16 11:51:58 +08:00
5c4ea16ad9 下发修改 2024-06-15 22:19:09 +08:00
32b61ceea9 下发修改 2024-06-15 18:07:47 +08:00
4f8a3236f2 下发修改 2024-06-15 14:25:52 +08:00
e2b9281d7b 海康下发人员修复 2024-06-14 11:36:19 +08:00
c59aa46e91 海康下发人员 2024-06-14 09:10:46 +08:00
GUO
551ca8ec67 海康下发修改 2024-06-12 23:28:31 +08:00