guoshengxiong 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
..
2025-07-24 09:44:58 +08:00
2024-04-14 21:05:01 +08:00
2024-07-09 16:42:03 +08:00
2025-06-18 15:24:09 +08:00