111 Commits

Author SHA1 Message Date
3ea38f4805 bug修复 2025-09-18 18:39:42 +08:00
46317684a3 桥机修复 2025-09-16 10:34:35 +08:00
2a0fb4bfd7 提交桥机接口 2025-09-15 09:19:05 +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
6113f6279a 新增黑名单退场、考勤v2bug修复 2025-06-30 17:49:54 +08:00
65338aecc9 对接小萨塔吊 2025-06-30 15:09:10 +08:00
34e5630443 进洞时间修改yyyy-MM-dd HH:mm:ss 2025-06-10 11:06:59 +08:00
f46d9368f1 模拟数据生成 2025-06-09 14:15:02 +08:00
ec86d09c76 模拟数据生成 2025-05-29 14:42:30 +08:00
50532d993b 模拟数据生成 2025-05-29 09:13:04 +08:00
9fb4d2bfea 模拟数据生成 2025-05-24 16:49:31 +08:00
aae75e0900 模拟数据生成 2025-05-23 10:06:09 +08:00
684891d637 模拟数据生成 2025-05-22 10:16:52 +08:00
e50a944ea4 模拟数据生成 2025-05-20 13:55:50 +08:00
810270b9af 模拟数据生成 2025-05-19 16:29:52 +08:00
088453c095 模拟数据生成 2025-05-16 09:49:04 +08:00
9f839af8f8 模拟数据生成 2025-05-15 16:30:39 +08:00
0aee8f3e8a 模拟数据生成 2025-05-14 18:14:04 +08:00
bbfc593bff 模拟数据生成 2025-05-14 11:00:55 +08:00
282b8626a3 模拟数据生成 2025-05-14 09:54:43 +08:00
37d6f98823 郑州水利调整 2025-03-06 09:44:46 +08:00
f237f78ebf 盾构机调整 2025-03-03 09:31:35 +08:00
bebeab1176 盾构机优化 2025-02-24 10:40:00 +08:00
bb15bed6b9 盾构机优化 2025-02-21 16:28:02 +08:00
fd6b3b6a89 盾构机管理 2025-02-14 18:20:56 +08:00
786e6d1106 汽车吊、履带吊数据对接 2024-11-15 18:24:41 +08:00
4e808120c1 汽车吊、履带吊 2024-11-15 14:41:11 +08:00
bff0d84786 bug修复 2024-09-05 17:44:32 +08:00
655c39137e Revert "设备加企业名称"
This reverts commit ef8df07ec20f8c6bdb0fcb08351fe8b2455f3251.
2024-08-07 10:53:55 +08:00
ef8df07ec2 设备加企业名称 2024-08-02 11:42:23 +08:00
410e2be414 保存日志加上前后变化的数据 2024-08-01 17:32:05 +08:00
6f1b7030c8 代码规范 2024-07-11 16:18:15 +08:00
d379b76f14 代码规范 2024-07-11 11:56:16 +08:00
dcd8fffe09 代码规范 2024-07-09 16:42:03 +08:00
b160b71b0f 代码规范 2024-07-05 19:07:36 +08:00
8c4e820c73 代码规范 2024-07-03 16:11:21 +08:00
GUO
af7fb6c80a bug修复 2024-06-28 20:51:36 +08:00
bb53af6a31 bug修改 2024-05-22 19:06:24 +08:00
guo
0fba7ba63d bug修复 2024-04-14 21:05:01 +08:00
guo
256d561294 龙门吊bug修改 2024-03-15 18:46:24 +08:00
guo
07146b5738 bug修改 2024-03-15 09:18:07 +08:00
guo
78b34e41a4 塔吊-人员考勤 2024-03-08 19:15:47 +08:00
guo
bc64525d95 bug修复 2024-03-06 16:57:17 +08:00
guo
977c07c308 bug修复 2024-02-01 09:25:37 +08:00
guo
cd869ac16e bug修复 2024-01-31 16:09:49 +08:00
guo
5ce3b18d33 bug修改 2024-01-23 16:15:20 +08:00
guo
6fb89a1ade bug修复 2024-01-04 18:16:34 +08:00
guo
78f81398b5 bug修复 2024-01-04 11:14:04 +08:00
guo
c3547173d7 bug修复 2023-12-29 15:07:54 +08:00
guo
df16567ee7 bug修复 2023-12-29 14:29:02 +08:00