196 Commits

Author SHA1 Message Date
afdea2e5bb bug修复 2025-08-27 17:47:11 +08:00
4ea32fd92d bug修改 2025-08-15 18:45:55 +08:00
d87e8aa639 安全隐患检查字段设置配置、隐患统计分析接口 2025-08-07 11:35:46 +08:00
87ed00d464 SmartJavaAIOcr的bug修改 2025-08-05 15:19:57 +08:00
73a2fc37b2 SmartJavaAIOrc的bug修改 2025-08-05 15:18:40 +08:00
369847e9d3 接入SmartJavaAIOrc 2025-08-04 11:34:57 +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
b178980110 ICC的数据校验 2025-07-29 10:03:02 +08:00
1b0fb0331b ocr和施工日志 2025-07-25 18:07:45 +08:00
63eea7c798 icc修改bug 2025-07-25 15:53:37 +08:00
0f21141944 icc修改bug 2025-07-25 15:53:00 +08:00
d0a5adc391 mcs8的bug修改 2025-07-25 10:35:52 +08:00
fb963c2f56 mcs8的bug修改 2025-07-25 10:35:03 +08:00
60a4832eef icc的错误重试 2025-07-25 09:46:49 +08:00
5641225773 Merge branch 'icc' into uat
# Conflicts:
#	src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
#	src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
2025-07-24 10:35:10 +08:00
edcee38819 mcs8修改bug 2025-07-24 10:04:21 +08:00
db96864829 mcs8修改bug 2025-07-24 10:02:42 +08:00
87f312ee98 icc的对接bug修改 2025-07-24 09:44:58 +08:00
c5b1d70097 Merge branch 'xjw_attendance' into uat
# Conflicts:
#	pom.xml
#	src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
#	src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
#	src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
#	src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
#	src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
#	src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
#	src/main/java/com/zhgd/xmgl/util/Fileutils.java
2025-07-23 15:02:15 +08:00
f394535531 icc的劳务人员对接修改 2025-07-19 11:04:52 +08:00
67855c9ce2 icc的劳务人员和考勤提交 2025-07-16 18:10:59 +08:00
a8b76fd788 icc的劳务人员同步提交 2025-07-16 14:27:44 +08:00
896ff7ba47 icc提交 2025-07-15 11:20:42 +08:00
3a12d05af0 工作票bug修复和批量人员绑定设备 2025-07-11 17:28:09 +08:00
41b81aa2dd 工作票bug修复 2025-07-09 16:29:45 +08:00
c05541f1db 执法记录仪和工作票
提2

提3

提3
2025-07-05 18:08:31 +08:00
502d11cac6 海康ai获取区域入侵图片 2025-06-10 16:04:47 +08:00
381561f3a4 isc推数据到环境模块bug修复 2024-09-29 16:54:09 +08:00
c2c38627d7 isc推数据到环境模块,污水取数据,车辆超速 2024-09-26 18:31:31 +08:00
83cd00a69d 劳务在场清零bug修复 2024-08-28 15:20:58 +08:00
a3bc633163 通知也给项目级别账号来一份 2024-07-15 18:48:31 +08:00
6f1b7030c8 代码规范 2024-07-11 16:18:15 +08:00
e8838e22f3 代码规范 2024-07-09 17:39:31 +08:00
dcd8fffe09 代码规范 2024-07-09 16:42:03 +08:00
9bc1a5870a 车辆bug修改 2024-07-05 19:31:06 +08:00
b160b71b0f 代码规范 2024-07-05 19:07:36 +08:00
980f56d7e6 代码规范和bug修复 2024-07-03 18:16:59 +08:00
8c4e820c73 代码规范 2024-07-03 16:11:21 +08:00
2f855d3d1e 代码规范 2024-07-01 09:51:07 +08:00
2a34ba4ebe bug优化 2024-06-29 16:49:17 +08:00
8f20420f9e ai修改 2024-06-28 17:53:47 +08:00
0873171a45 bug修改 2024-06-27 20:00:17 +08:00
6e92b68ab7 数据校验bug修复 2024-06-27 10:07:05 +08:00
54091015f8 绑定车辆群组修改 2024-06-26 15:49:13 +08:00
GUO
54012cc383 同步拉取bug修复 2024-06-20 23:30:45 +08:00
GUO
941b1e3082 Revert "内网访问图片"
This reverts commit e255264a01e7da8d1a457d297272cbddd59e1b47.
2024-06-20 22:46:31 +08:00
e255264a01 内网访问图片 2024-06-20 18:45:01 +08:00
6f084af0eb 车辆的人员的考勤 2024-06-19 11:54:31 +08:00
GUO
4da1379f67 海康下发修改 2024-06-16 23:48:50 +08:00