18 Commits

Author SHA1 Message Date
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
e7eef4e308 环境设备10分钟没有接收数据就离线,混凝土拌合站bug修复 2025-07-30 15:17:28 +08:00
15e7276605 基建大屏 2025-06-09 09:24:30 +08:00
0debb337ce 模拟数据配置 2025-05-30 17:35:09 +08:00
02315459dd 标准版优化 2025-05-12 09:05:30 +08:00
b160b71b0f 代码规范 2024-07-05 19:07:36 +08:00
5d46436ae7 设备表修改合作单位字段名 2024-07-04 17:36:23 +08:00
78786d99b2 设备表增加合作单位字段 2024-07-04 16:19:59 +08:00
guo
0fba7ba63d bug修复 2024-04-14 21:05:01 +08:00
guo
2e5ebd29b1 bug修复 2024-02-03 18:01:01 +08:00
guo
3460fdc3d4 bug修复 2024-02-03 15:58:41 +08:00
guo
cd869ac16e bug修复 2024-01-31 16:09:49 +08:00
guo
83dbd47d58 bug修复 2024-01-31 14:38:06 +08:00
guo
4264a566ca bug修复 2024-01-27 17:28:39 +08:00
guo
c85ebfc276 bug修复 2024-01-27 10:25:07 +08:00
guo
5ce3b18d33 bug修改 2024-01-23 16:15:20 +08:00
guo
598a2a87e1 bug修复 2023-11-06 11:17:42 +08:00
guo
e839917ae2 架桥机、水稳拌合站的后台接口 2023-11-04 15:19:14 +08:00