|
|
a9955d50b5
|
工作票null修复
|
2025-10-09 17:55:50 +08:00 |
|
|
|
f69964d66d
|
上传bug修改
|
2025-09-30 18:02:55 +08:00 |
|
|
|
ff4d31c0e2
|
工单等bug优化
|
2025-09-30 17:15:17 +08:00 |
|
|
|
d617e8c499
|
machine_device提交
|
2025-09-30 17:13:05 +08:00 |
|
|
|
7fc738861f
|
工单优化
|
2025-09-29 17:54:58 +08:00 |
|
|
|
abb64f8d92
|
增加工单等其他bug
|
2025-09-28 18:36:59 +08:00 |
|
|
|
bbfa43e521
|
新危大工程
|
2025-09-26 16:14:52 +08:00 |
|
|
|
d99914d445
|
新危大工程
|
2025-09-26 16:13:33 +08:00 |
|
|
|
316f7f45e3
|
执法记录仪导出
|
2025-09-25 10:38:13 +08:00 |
|
|
|
7340d99c2c
|
执法记录仪导出
|
2025-09-25 10:37:26 +08:00 |
|
|
|
aa429808d5
|
执法记录仪导出
|
2025-09-25 10:35:29 +08:00 |
|
|
|
a24cbd89ba
|
导出图片到excel bug修复
|
2025-09-25 10:32:31 +08:00 |
|
|
|
46317684a3
|
桥机修复
|
2025-09-16 10:34:35 +08:00 |
|
|
|
b4f248d7a3
|
项目数据权限
|
2025-09-13 10:24:05 +08:00 |
|
|
|
9e49c6f7bc
|
优化权限和bug修复
|
2025-09-10 20:26:17 +08:00 |
|
|
|
eb4823bf5a
|
优化权限和上传文件等
|
2025-09-09 17:55:41 +08:00 |
|
|
|
48f41ef72a
|
广播和视频分组导入
|
2025-09-08 17:04:43 +08:00 |
|
|
|
d407d558af
|
广播接口和bug修复
|
2025-09-04 17:58:29 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
5b678c3ee1
|
bug修复和mysql批量替换值
|
2025-08-30 18:12:22 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
cdd918d0ef
|
bug修复
|
2025-08-28 16:49:47 +08:00 |
|
|
|
9474d49433
|
Merge branch 'mod_security' into prod
|
2025-08-27 18:23:11 +08:00 |
|
|
|
afdea2e5bb
|
bug修复
|
2025-08-27 17:47:11 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
c9747cfbef
|
bug修复
|
2025-08-26 19:29:39 +08:00 |
|
|
|
2bdd14aec2
|
bug修复
|
2025-08-22 19:47:15 +08:00 |
|
|
|
ca6f3100e1
|
bug修复
|
2025-08-22 14:39:56 +08:00 |
|
|
|
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 |
|
|
|
d015d534f1
|
bug修复
|
2025-08-21 18:53:35 +08:00 |
|
|
|
7a4acb5a45
|
智能安全帽人员每日工作统计相关和bug修改
|
2025-08-16 18:21:28 +08:00 |
|
|
|
933b8012be
|
修改bug
|
2025-08-14 14:45:23 +08:00 |
|
|
|
0cf0c64722
|
修改bug
|
2025-08-13 11:43:02 +08:00 |
|
|
|
ecaaf0cdc2
|
配置调整
|
2025-08-07 11:33:01 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +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 |
|
|
|
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 |
|
|
|
6e0f08bfa9
|
人脸设备对接
|
2025-07-21 10:44:43 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
8d734b46f7
|
Merge branch 'xjw_attendance' into prod
|
2025-07-12 09:56:18 +08:00 |
|
|
|
389ffcd285
|
中水北方修改
|
2025-07-11 18:18:24 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
549c6fd610
|
新金湾，新考勤
|
2025-06-25 10:22:40 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
f46d9368f1
|
模拟数据生成
|
2025-06-09 14:15:02 +08:00 |
|
|
|
ee4af0566b
|
风险清单库
|
2025-06-06 14:19:44 +08:00 |
|
|
|
50532d993b
|
模拟数据生成
|
2025-05-29 09:13:04 +08:00 |
|
|
|
735d67c44e
|
模拟数据生成
|
2025-05-27 16:34:26 +08:00 |
|
