Commit Graph

907 Commits

Author SHA1 Message Date
5c251e6a25 Merge pull request 'projects/mesxc-zjl' (#210) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #210
2024-02-27 09:14:48 +08:00
a8013fce87 merge test 2024-02-27 09:14:10 +08:00
65e2f9ed6a 订单bug修改 2024-02-27 09:12:17 +08:00
ad3a2cb1ae Merge pull request 'projects/mesxc-lb' (#209) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #209
2024-02-27 09:11:12 +08:00
lb
6d3b41a394 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-26 17:06:19 +08:00
007cf5e638 Merge pull request '订单bug' (#208) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #208
2024-02-26 13:19:19 +08:00
3e89f4066f 订单bug 2024-02-26 13:18:21 +08:00
2c12a26e64 Merge pull request 'projects/mesxc-zjl' (#207) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #207
2024-02-26 10:46:26 +08:00
c5925e54cd merge test 2024-02-26 10:45:48 +08:00
af426f4bf8 Merge pull request 'projects/mesxc-dy' (#206) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #206
2024-02-26 10:44:07 +08:00
lb
512986faf6 fix navbar right 2024-02-26 10:28:16 +08:00
b08639f15c merge test 2024-02-26 10:19:35 +08:00
9a807ff798 能源bug修改 2024-02-26 10:15:56 +08:00
helloDy
7da93bbca0 merge 2024-02-26 08:46:18 +08:00
helloDy
0abf628377 设备 2024-02-26 08:44:42 +08:00
e78a5e1b85 Merge pull request 'projects/mesxc-lb' (#205) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #205
2024-02-26 02:14:06 +08:00
helloDy
35da704bb4 设备保养 2024-02-24 19:18:11 +08:00
lb
2997f4b7b9 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-23 17:15:56 +08:00
lb
4316e7f37f merge & delete yarn.lock 2024-02-23 17:14:28 +08:00
38bb5a31e7 Merge pull request 'projects/mesxc-zjl' (#204) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #204
2024-02-23 17:13:39 +08:00
842b863561 merge test 2024-02-23 17:11:24 +08:00
lb
89e86c31bb update 巡检记录 2024-02-23 17:03:55 +08:00
71fc98b0bb 订单管理 2024-02-23 17:01:48 +08:00
lb
15738642b0 update 2024-02-23 16:32:01 +08:00
2c88d442f2 Merge pull request 'projects/mesxc-zhp' (#203) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #203
2024-02-23 16:14:40 +08:00
‘937886381’
8dccbdbeb7 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-02-23 16:13:11 +08:00
‘937886381’
81c1f2c571 xiugaibug 2024-02-23 16:12:43 +08:00
5dd551c795 Merge pull request 'projects/mesxc-zhp' (#202) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #202
2024-02-23 16:09:54 +08:00
‘937886381’
a6f7bb2f2d 解决冲突 2024-02-23 16:04:05 +08:00
‘937886381’
05b513a862 修改 2024-02-23 16:02:55 +08:00
lb
f72cd9d68e update 待确认 2024-02-23 15:11:36 +08:00
lb
99b225e3dc update 巡检待确认 2024-02-23 11:20:04 +08:00
lb
4d1b72fae7 update 巡检待确认 2024-02-23 09:45:43 +08:00
lb
67a76869e1 update 巡检单待确认 2024-02-22 16:52:07 +08:00
lb
ca2774ca28 update navbar user dept 2024-02-22 16:23:19 +08:00
lb
1dd7fef171 update 巡检待确认 2024-02-22 16:19:02 +08:00
lb
9ad83f84fa update 巡检单设置 2024-02-22 16:11:30 +08:00
lb
ef354732b4 update 巡检单设置 2024-02-22 11:21:59 +08:00
478baaabd4 Merge pull request 'projects/mesxc-dy' (#201) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #201
2024-02-22 09:31:30 +08:00
helloDy
ff19047729 merge 2024-02-21 18:47:46 +08:00
helloDy
ea7c419c6f 基础核心,设备基础 2024-02-21 18:39:48 +08:00
lb
95a4b336f8 update 2024-02-21 16:55:35 +08:00
lb
ed65bd7f30 update check record 2024-02-21 16:39:43 +08:00
fd03fdf046 Merge pull request 'projects/mesxc-zhp' (#200) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #200
2024-02-21 16:09:58 +08:00
lb
5b40c3972c update repair detail 2024-02-21 15:51:59 +08:00
‘937886381’
d3b87e4051 解决冲突 2024-02-21 15:28:15 +08:00
‘937886381’
03ee5e1037 修改bug 2024-02-21 15:27:09 +08:00
lb
f8c2889abc update repair 2024-02-21 14:44:15 +08:00
lb
eb0445f479 update 特种设备维修 2024-02-20 17:00:56 +08:00
lb
9f8d604456 done 保养模块 2024-02-20 15:53:31 +08:00