|
|
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 |
|
|
|
5101d248a5
|
仁智测控转发扬尘Hj212集成
|
2025-08-12 17:14:01 +08:00 |
|
|
|
395d2a1617
|
Merge branch 'ocr' into uat
|
2025-08-04 09:30:06 +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 |
|
|
|
9f839af8f8
|
模拟数据生成
|
2025-05-15 16:30:39 +08:00 |
|
|
|
cf343c9ab0
|
模拟数据生成
|
2025-05-12 14:45:19 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
6d2b587c2d
|
中铁项目定制
|
2024-10-21 15:40:09 +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
|
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
|
07cc808c16
|
bug修复和龙门吊接口获取
|
2023-12-27 17:45:53 +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
|
53870d2d36
|
大屏电脑部分代码
|
2023-10-31 17:45:22 +08:00 |
|
guo
|
6e35b1aeb3
|
金林湾bug修复
|
2023-09-15 14:51:12 +08:00 |
|
guo
|
84d907af1d
|
天气和在线离线
|
2023-09-08 14:42:19 +08:00 |
|
guo
|
97f07ddb93
|
项目子账号只查看自己的视频、人脸、合作单位
|
2023-08-25 11:35:49 +08:00 |
|
guo
|
04808c7566
|
携稳获取扬尘数据
|
2023-08-02 17:59:49 +08:00 |
|
guo
|
1a1c5fe740
|
bug修改
|
2023-07-29 14:41:03 +08:00 |
|
guo
|
9ffe8aa37d
|
bug修改
|
2023-07-27 16:16:49 +08:00 |
|
guo
|
cf7c1a112c
|
24小时进出时间段统计bug修复
|
2023-07-24 18:29:04 +08:00 |
|
guo
|
522e3caac6
|
bug修复
|
2023-07-20 17:53:00 +08:00 |
|
guo
|
47d8d77e9b
|
bug修复
|
2023-07-18 15:49:23 +08:00 |
|
guo
|
12276bfea7
|
bug修复
|
2023-07-17 17:21:26 +08:00 |
|
|
|
4e26395751
|
代码优化
|
2023-06-14 10:15:05 +08:00 |
|
|
|
30279b31a3
|
代码优化
|
2023-06-12 15:22:22 +08:00 |
|
|
|
72af5999d5
|
bug修改
|
2023-06-02 13:59:52 +08:00 |
|
|
|
c625241047
|
bug修改
|
2023-05-31 17:50:30 +08:00 |
|
|
|
d0b61dbc31
|
bug修改
|
2023-05-27 19:28:31 +08:00 |
|
|
|
e490595d48
|
钢丝绳bug修改
|
2023-05-26 17:39:22 +08:00 |
|
|
|
03d7cfe1ac
|
三江-标准版-修改
|
2023-05-06 18:23:04 +08:00 |
|
|
|
cc565109bf
|
设备人数bug修复
|
2023-04-01 23:10:33 +08:00 |
|
|
|
35554aa6cc
|
bug修复
|
2023-04-01 10:46:58 +08:00 |
|
