Commit Graph

647 Commits

Author SHA1 Message Date
lb
5ad93105b3 update login 2023-12-19 09:31:38 +08:00
lb
d06756c6ff Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-19 09:07:55 +08:00
lb
5ac17b15e1 update merge 2023-12-19 09:07:19 +08:00
4e064e4b01 Merge pull request 'projects/mesxc-lb' (#149) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #149
2023-12-19 09:02:24 +08:00
lb
f280a92145 merge test 2023-12-19 09:01:13 +08:00
lb
aaa131cb1f update 巡检记录 2023-12-18 17:00:47 +08:00
lb
f6af441030 update 巡检配置 2023-12-18 16:32:16 +08:00
lb
cb9132abc1 update 2023-12-18 15:48:18 +08:00
lb
5886875770 update 维修 2023-12-18 15:39:18 +08:00
a766318e20 Merge pull request '成本bug' (#148) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #148
2023-12-18 14:34:04 +08:00
41cef952ac Merge branch 'projects/mesxc-test' into projects/mesxc-zwq 2023-12-18 14:33:59 +08:00
zwq
ef4b31fe2b 成本bug 2023-12-18 14:33:31 +08:00
c8219bd7ee Merge pull request '修改成本bug' (#147) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #147
2023-12-18 14:26:46 +08:00
zwq
20f5a0d4c7 修改成本bug 2023-12-18 14:26:23 +08:00
lb
fd4b0088dc update 特殊设备保养 2023-12-18 14:25:08 +08:00
e039a3992d Merge pull request 'projects/mesxc-zhp' (#146) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #146
2023-12-15 16:29:57 +08:00
‘937886381’
c8d55ff625 解决冲突 2023-12-15 16:28:37 +08:00
‘937886381’
83fc835c51 质量管理 2023-12-15 16:27:30 +08:00
lb
165a833088 update 保养记录 2023-12-14 16:58:33 +08:00
gtz
8d5623bb24 '1' 2023-12-14 16:07:21 +08:00
4fa49c46ff Merge pull request 'projects/mesxc-zjl' (#145) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #145
2023-12-14 15:55:28 +08:00
ae251fc428 merge test 2023-12-14 15:54:46 +08:00
a2c61b86ca Merge pull request 'projects/mesxc-dy' (#144) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #144
2023-12-14 15:52:47 +08:00
503e3442a0 merge test 2023-12-14 15:51:26 +08:00
69a65b32ea 12.14测试bug 2023-12-14 15:48:35 +08:00
lb
5ac0782b36 update 设备保养监控 2023-12-14 15:33:38 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
29ea06e5be Merge pull request 'projects/mesxc-zhp' (#143) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #143
2023-12-13 17:08:40 +08:00
‘937886381’
f5bb5f27b4 修改 2023-12-13 16:55:39 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
lb
46dd33cb05 update 特种设备保养 2023-12-13 10:57:02 +08:00
gtz
68898ea67f '1' 2023-12-13 09:49:02 +08:00
gtz
1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-13 09:48:44 +08:00
0f4bddc6d1 Merge pull request '更新成本和仓库' (#141) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #141
2023-12-13 09:19:00 +08:00
zwq
91d269e1ce 更新成本和仓库 2023-12-13 09:18:36 +08:00
4e26d49ff5 Merge pull request '首页' (#140) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #140
2023-12-13 09:16:28 +08:00
63b19d84e4 首页 2023-12-13 09:12:52 +08:00
lb
5f47cb131f add 添加消防设备 2023-12-12 16:50:18 +08:00
lb
ea21f3d4bc add 安全设备,特种设备 2023-12-12 16:27:37 +08:00
lb
bdda6c9985 add 特殊设备 2023-12-12 13:57:02 +08:00
lb
ae83da6eb9 almost done 2023-12-12 11:29:56 +08:00
6c7390f61e Merge pull request 'projects/mesxc-zjl' (#139) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #139
2023-12-12 10:57:12 +08:00
1661615af4 环保 2023-12-12 10:56:25 +08:00
lb
b62d0e4096 add israchart 2023-12-12 10:53:00 +08:00
lb
1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-11 10:22:51 +08:00
lb
6b3619514d update 驾驶舱 2023-12-11 10:21:45 +08:00
lb
dee9f7ce8b update 2023-12-11 09:47:58 +08:00
lb
b4d2b69004 update 2023-12-11 09:11:51 +08:00
8fdaa3e968 环保管理 2023-12-08 17:03:01 +08:00