|
|
d0a5adc391
|
mcs8的bug修改
|
2025-07-25 10:35:52 +08:00 |
|
|
|
fb963c2f56
|
mcs8的bug修改
|
2025-07-25 10:35:03 +08:00 |
|
|
|
321b5e41a1
|
Merge branch 'uat' into ocr
|
2025-07-25 09:51:08 +08:00 |
|
|
|
60a4832eef
|
icc的错误重试
|
2025-07-25 09:46:49 +08:00 |
|
|
|
3dee4efb53
|
Merge remote-tracking branch 'origin/uat' into uat
|
2025-07-24 18:31:01 +08:00 |
|
|
|
39415752dd
|
执法记录仪拉取时间更改
|
2025-07-24 18:30:43 +08:00 |
|
|
|
ac11217e31
|
删除多余字段
|
2025-07-24 11:03:05 +08:00 |
|
|
|
d187dfe6d8
|
删除多余字段
|
2025-07-24 10:59:01 +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 |
|
|
|
cd4c76a04d
|
mcs8修改bug
|
2025-07-24 10:04:54 +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 |
|
|
|
a2e184116d
|
icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间
|
2025-07-23 18:06:33 +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 |
|
|
|
97c134b227
|
Merge branch 'xjw_attendance' into prod
|
2025-07-23 14:52:32 +08:00 |
|
|
|
41d32bbda2
|
管控bug修改
|
2025-07-22 18:08:32 +08:00 |
|
|
|
6e0f08bfa9
|
人脸设备对接
|
2025-07-21 10:44:43 +08:00 |
|
|
|
c04d785c5f
|
管控bug修改
|
2025-07-21 10:42:03 +08:00 |
|
|
|
f394535531
|
icc的劳务人员对接修改
|
2025-07-19 11:04:52 +08:00 |
|
|
|
19df573b88
|
管控bug修改
|
2025-07-17 16:02:12 +08:00 |
|
|
|
67855c9ce2
|
icc的劳务人员和考勤提交
|
2025-07-16 18:10:59 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
3212f171f5
|
定时2分钟获取人员定位标签报警数据任务bug修复
|
2025-07-16 11:41:01 +08:00 |
|
|
|
7dfee323ee
|
企业大屏配置和修改
|
2025-07-16 09:08:34 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
7e71847287
|
弹弓根据勾选设备进行下发
|
2025-07-14 15:08:27 +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 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
cc6ddce242
|
中水北方修改
|
2025-07-10 09:43:51 +08:00 |
|
|
|
41b81aa2dd
|
工作票bug修复
|
2025-07-09 16:29:45 +08:00 |
|
|
|
19ceb728db
|
工作票bug修复
|
2025-07-09 10:06:07 +08:00 |
|
|
|
fe98b1766f
|
工作票bug修复
|
2025-07-08 10:03:24 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
355db840c1
|
中水北方修改
|
2025-07-05 13:36:05 +08:00 |
|
|
|
3d34bd6dc1
|
中水北方修改
|
2025-07-05 11:20:58 +08:00 |
|
|
|
ce8752b742
|
中水北方修改
|
2025-07-04 17:46:20 +08:00 |
|
|
|
9fc9d4e4ac
|
芊熠智能bug修复
|
2025-07-03 14:59:48 +08:00 |
|
|
|
3cd79fdc81
|
统计考勤列表bug修复
|
2025-07-03 10:50:17 +08:00 |
|
|
|
cd61d61d19
|
Merge branch 'xjw_attendance' into prod
|
2025-07-02 16:24:58 +08:00 |
|
|
|
daa3e585ac
|
增加查询参数
|
2025-07-01 16:01:47 +08:00 |
|
|
|
0ba2865b17
|
Merge branch 'xjw_attendance' into prod
|
2025-07-01 15:03:50 +08:00 |
|
|
|
db34228767
|
整合扬尘hj212
|
2025-07-01 15:03:04 +08:00 |
|
|
|
121deb6de5
|
扬尘查询慢修复
|
2025-07-01 13:40:30 +08:00 |
|
|
|
13cf189faa
|
黑名单退场bug修复
|
2025-06-30 18:00:17 +08:00 |
|
|
|
6113f6279a
|
新增黑名单退场、考勤v2bug修复
|
2025-06-30 17:49:54 +08:00 |
|
|
|
65338aecc9
|
对接小萨塔吊
|
2025-06-30 15:09:10 +08:00 |
|
|
|
2e475dcf9f
|
提交.gitignore
|
2025-06-30 14:35:48 +08:00 |
|
|
|
fd9513b805
|
Merge branch 'xjw_attendance' into prod
|
2025-06-27 19:59:46 +08:00 |
|
