|
|
ac68011c81
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:54:46 +08:00 |
|
|
|
328bc4b0d5
|
批量复制默认工种数据到某个项目bug修复
|
2025-10-17 18:54:29 +08:00 |
|
|
|
6199555729
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:48:44 +08:00 |
|
|
|
76694a1b17
|
查询企业的树形项目和监控分组和监控列表和云端根据条件删除执法记录仪文件信息
|
2025-10-17 18:48:18 +08:00 |
|
|
|
8c228f1495
|
替换wss
|
2025-10-17 18:47:14 +08:00 |
|
|
|
32913ad718
|
工作票bug修复
|
2025-10-17 18:46:38 +08:00 |
|
|
|
a5b9ef2dbd
|
合并解决冲突或升级jdk17语法
|
2025-10-17 14:49:38 +08:00 |
|
|
|
03a64da51a
|
配置填错了
|
2025-10-16 17:03:06 +08:00 |
|
|
|
0eb84d4cf6
|
合并解决冲突或升级jdk17语法
|
2025-10-16 16:57:07 +08:00 |
|
|
|
d4bd514d9a
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# pom.xml
|
2025-10-16 16:55:13 +08:00 |
|
|
|
268d6bbdd6
|
ocr的SmartJavaAI离线
|
2025-10-16 16:44:41 +08:00 |
|
|
|
111e1962ba
|
合并升级jdk17语法
|
2025-10-15 18:12:09 +08:00 |
|
|
|
d15c62efd0
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/MockUtil.java
# src/main/resources/application-gsx-other-env-show.properties
|
2025-10-15 18:10:27 +08:00 |
|
|
|
443b6e6f3c
|
大屏项目点位配置
|
2025-10-15 16:13:04 +08:00 |
|
|
|
0300705243
|
dunhuan-jdk8配置
|
2025-10-15 16:11:57 +08:00 |
|
|
|
b4dd77eb9e
|
mock
|
2025-10-15 10:34:39 +08:00 |
|
|
|
efc4dca17e
|
大屏bug修复
|
2025-10-15 10:34:22 +08:00 |
|
|
|
f7373aa125
|
isc的ai预警bug修复
|
2025-10-14 15:51:40 +08:00 |
|
|
|
200c25c5b4
|
isc的ai预警图片bug修复
|
2025-10-14 09:52:45 +08:00 |
|
|
|
047f7834af
|
的isc的回调接口的ai预警上传（event_aimms类型）
|
2025-10-13 17:38:14 +08:00 |
|
|
|
7d249778b2
|
Merge branch 'uat' into dunhuang
|
2025-10-11 17:03:10 +08:00 |
|
|
|
d3438c520e
|
允许html上传
|
2025-10-11 17:02:53 +08:00 |
|
|
|
3e8cbdc6a3
|
合并升级jdk17语法
|
2025-10-11 17:02:02 +08:00 |
|
|
|
1e0975255a
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckRecordController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableRecordController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
|
2025-10-11 16:59:10 +08:00 |
|
|
|
65c4b09c7b
|
bindTicket查询修复
|
2025-10-11 16:55:15 +08:00 |
|
|
|
2adf8fc0f0
|
代码优化
|
2025-10-11 10:59:07 +08:00 |
|
|
|
64b9f1ba55
|
企业或项目资料中心接口
|
2025-10-11 10:47:35 +08:00 |
|
|
|
84c3ff4542
|
机械设备导入导出
|
2025-10-10 17:21:10 +08:00 |
|
|
|
2227f942bf
|
规范添加安全检查记录信息时间
|
2025-10-10 17:00:19 +08:00 |
|
|
|
54851acfe2
|
删除安全检查记录信息优化
|
2025-10-10 15:16:43 +08:00 |
|
|
|
25f564b2b7
|
隐患工单派发生成隐患单去重
|
2025-10-10 13:59:13 +08:00 |
|
|
|
8b1fd8996e
|
批量删除执法记录仪设备修复
|
2025-10-10 13:58:31 +08:00 |
|
|
|
b851bebabc
|
执法记录仪视频配置null修复
|
2025-10-09 17:56:18 +08:00 |
|
|
|
a9955d50b5
|
工作票null修复
|
2025-10-09 17:55:50 +08:00 |
|
|
|
296bafed19
|
devSn不能是eq
|
2025-09-30 19:11:24 +08:00 |
|
|
|
d1f2ac63be
|
devSn不能是eq
|
2025-09-30 19:11:10 +08:00 |
|
|
|
5d3516837f
|
Merge branch 'uat' into dunhuang
|
2025-09-30 18:04:29 +08:00 |
|
|
|
f69964d66d
|
上传bug修改
|
2025-09-30 18:02:55 +08:00 |
|
|
|
1115dcd968
|
合并升级jdk17语法
|
2025-09-30 17:57:25 +08:00 |
|
|
|
934b6633b9
|
合并uat冲突修改
|
2025-09-30 17:27:46 +08:00 |
|
|
|
6bf66b867e
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-09-30 17:16:55 +08:00 |
|
|
|
ff4d31c0e2
|
工单等bug优化
|
2025-09-30 17:15:17 +08:00 |
|
|
|
d617e8c499
|
machine_device提交
|
2025-09-30 17:13:05 +08:00 |
|
|
|
8786b8302e
|
bigdanger修复
|
2025-09-30 17:12:42 +08:00 |
|
|
|
e06cef4d70
|
合并uat冲突修改
|
2025-09-30 09:18:49 +08:00 |
|
|
|
3d7a9774dc
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
# src/main/java/com/zhgd/xmgl/util/MapUtil.java
# src/main/java/com/zhgd/xmgl/util/WordUtils.java
|
2025-09-30 09:10:27 +08:00 |
|
|
|
64b89dc734
|
合并uat的执法记录仪导出
|
2025-09-29 19:16:42 +08:00 |
|
|
|
4e3fefa0f4
|
工单优化
|
2025-09-29 17:55:22 +08:00 |
|
|
|
7fc738861f
|
工单优化
|
2025-09-29 17:54:58 +08:00 |
|
|
|
5441abe588
|
修改工单bug
|
2025-09-29 17:31:14 +08:00 |
|
