|
|
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 |
|
|
|
72d55cd321
|
扬尘增加蒸发量
|
2025-08-14 10:11:16 +08:00 |
|
|
|
5101d248a5
|
仁智测控转发扬尘Hj212集成
|
2025-08-12 17:14:01 +08:00 |
|
|
|
395d2a1617
|
Merge branch 'ocr' into uat
|
2025-08-04 09:30:06 +08:00 |
|
|
|
e7eef4e308
|
环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复
|
2025-07-30 15:17:28 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
33b000f90c
|
map改成对象
|
2025-07-25 15:08:22 +08:00 |
|
|
|
8926a006da
|
map改成对象
|
2025-07-25 15:07:56 +08:00 |
|
|
|
121deb6de5
|
扬尘查询慢修复
|
2025-07-01 13:40:30 +08:00 |
|
|
|
810270b9af
|
模拟数据生成
|
2025-05-19 16:29:52 +08:00 |
|
|
|
088453c095
|
模拟数据生成
|
2025-05-16 09:49:04 +08:00 |
|
|
|
9f839af8f8
|
模拟数据生成
|
2025-05-15 16:30:39 +08:00 |
|
|
|
0aee8f3e8a
|
模拟数据生成
|
2025-05-14 18:14:04 +08:00 |
|
|
|
cf343c9ab0
|
模拟数据生成
|
2025-05-12 14:45:19 +08:00 |
|
|
|
02315459dd
|
标准版优化
|
2025-05-12 09:05:30 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
6d2b587c2d
|
中铁项目定制
|
2024-10-21 15:40:09 +08:00 |
|
|
|
655c39137e
|
Revert "设备加企业名称"
This reverts commit ef8df07ec20f8c6bdb0fcb08351fe8b2455f3251.
|
2024-08-07 10:53:55 +08:00 |
|
|
|
ef8df07ec2
|
设备加企业名称
|
2024-08-02 11:42:23 +08:00 |
|
|
|
021a87fabf
|
代码加注释
|
2024-07-10 09:41:45 +08:00 |
|
|
|
b160b71b0f
|
代码规范
|
2024-07-05 19:07:36 +08:00 |
|
|
|
95fdd8b9ff
|
设备表修改合作单位字段名
|
2024-07-04 17:37:39 +08:00 |
|
|
|
5d46436ae7
|
设备表修改合作单位字段名
|
2024-07-04 17:36:23 +08:00 |
|
|
|
78786d99b2
|
设备表增加合作单位字段
|
2024-07-04 16:19:59 +08:00 |
|
|
|
8c4e820c73
|
代码规范
|
2024-07-03 16:11:21 +08:00 |
|
|
|
9c31326994
|
雨量bug修改
|
2024-07-03 10:59:26 +08:00 |
|
|
|
77f915e849
|
雨量bug修改
|
2024-07-03 10:10:52 +08:00 |
|
|
|
6440b9d422
|
bug修复和代码规范
|
2024-07-01 17:38:31 +08:00 |
|
|
|
d814d56a00
|
代码规范
|
2024-07-01 14:18:33 +08:00 |
|
|
|
968ab5da60
|
代码规范
|
2024-07-01 14:17:43 +08:00 |
|
|
|
3587197e44
|
雨量大屏接口
|
2024-06-29 16:13:03 +08:00 |
|
|
|
6a0a44b2b5
|
雨量bug修复
|
2024-06-27 11:07:32 +08:00 |
|
|
|
fbd478e142
|
bug修复
|
2024-06-25 18:15:46 +08:00 |
|
|
|
725e45903b
|
bug修复
|
2024-06-24 21:53:04 +08:00 |
|
|
|
00e2e44699
|
雨量代码
|
2024-06-24 16:15:01 +08:00 |
|
guo
|
0fba7ba63d
|
bug修复
|
2024-04-14 21:05:01 +08:00 |
|
guo
|
9e49309773
|
喷淋自动关闭，超时10分钟扬尘不报警
|
2024-03-13 14:31:13 +08:00 |
|
guo
|
b30d722d85
|
bug修复
|
2024-02-02 16:01:20 +08:00 |
|
guo
|
8c27d7980d
|
bug修复
|
2024-01-25 16:14:17 +08:00 |
|
guo
|
579927c32c
|
水稳拌合站
|
2024-01-24 15:35:53 +08:00 |
|
guo
|
6fb89a1ade
|
bug修复
|
2024-01-04 18:16:34 +08:00 |
|
guo
|
c3547173d7
|
bug修复
|
2023-12-29 15:07:54 +08:00 |
|
guo
|
df16567ee7
|
bug修复
|
2023-12-29 14:29:02 +08:00 |
|
guo
|
07cc808c16
|
bug修复和龙门吊接口获取
|
2023-12-27 17:45:53 +08:00 |
|
guo
|
cad833789c
|
榕图-风险安全库
|
2023-12-20 16:27:41 +08:00 |
|
guo
|
67ee1959a1
|
bug修复
|
2023-12-16 11:32:44 +08:00 |
|
guo
|
6fbb77235c
|
bug修复
|
2023-12-04 10:13:15 +08:00 |
|
guo
|
be99b64aa7
|
bug修复
|
2023-12-02 11:10:52 +08:00 |
|
guo
|
ba891391c1
|
api文档名称增加修改和删除
|
2023-11-09 09:54:42 +08:00 |
|
guo
|
53870d2d36
|
大屏电脑部分代码
|
2023-10-31 17:45:22 +08:00 |
|
