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

..

controller

map改成对象

2025-07-25 15:08:22 +08:00

entity

扬尘增加蒸发量

2025-08-14 10:11:16 +08:00

mapper

环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复

2025-07-30 15:17:28 +08:00

service

Merge branch 'prod' into mod_security

2025-08-21 18:56:44 +08:00