|
|
76c2f50bf3
|
fix bugs
|
2023-11-27 11:31:21 +08:00 |
|
|
|
d5507ec4c0
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 19:15:23 +08:00 |
|
|
|
8802c932e2
|
update 设备报警日志
|
2023-11-24 19:10:33 +08:00 |
|
|
|
ee26741e62
|
Merge pull request 'projects/mes-dy' (#113) from projects/mes-dy into projects/mes-test
Reviewed-on: #113
|
2023-11-24 19:06:04 +08:00 |
|
helloDy
|
7f5b9d5228
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-24 19:03:48 +08:00 |
|
helloDy
|
9eea7e049a
|
部分bug
|
2023-11-24 19:01:25 +08:00 |
|
|
|
328b3ff560
|
Merge pull request 'projects/mes-zjl' (#112) from projects/mes-zjl into projects/mes-test
Reviewed-on: #112
|
2023-11-24 17:32:15 +08:00 |
|
|
|
b3a117f6c6
|
merge test
|
2023-11-24 17:31:21 +08:00 |
|
|
|
8929e53724
|
ui样式
|
2023-11-24 17:29:40 +08:00 |
|
|
|
a8fa98cb91
|
update StatusAndParams
|
2023-11-24 14:56:17 +08:00 |
|
|
|
db081c1bd1
|
Merge pull request '更新仓库' (#111) from projects/mes-zwq into projects/mes-test
Reviewed-on: #111
|
2023-11-24 14:37:15 +08:00 |
|
|
|
3e9540bcc9
|
更新仓库
|
2023-11-24 14:36:59 +08:00 |
|
|
|
69ceadab69
|
Merge pull request '更新仓库bug' (#110) from projects/mes-zwq into projects/mes-test
Reviewed-on: #110
|
2023-11-24 14:33:20 +08:00 |
|
|
|
601387184e
|
更新仓库bug
|
2023-11-24 14:32:58 +08:00 |
|
|
|
54b63a7f53
|
update drawer and edit
|
2023-11-24 10:41:11 +08:00 |
|
|
|
b625ef0118
|
Merge pull request 'projects/mes-dy' (#109) from projects/mes-dy into projects/mes-test
Reviewed-on: #109
|
2023-11-24 09:19:27 +08:00 |
|
helloDy
|
8004c85c32
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-24 09:14:32 +08:00 |
|
helloDy
|
9041428003
|
部分bug
|
2023-11-24 09:13:56 +08:00 |
|
|
|
39d06cd902
|
Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test
Reviewed-on: #108
|
2023-11-24 08:56:13 +08:00 |
|
|
|
d79ba71bd7
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 08:51:18 +08:00 |
|
|
|
0225be1c94
|
fix bugs
|
2023-11-23 17:07:57 +08:00 |
|
|
|
265024d989
|
Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test
Reviewed-on: #107
|
2023-11-23 16:58:12 +08:00 |
|
|
|
960751a264
|
merge test
|
2023-11-23 16:57:39 +08:00 |
|
|
|
978aa3a1d1
|
ui修改
|
2023-11-23 16:56:08 +08:00 |
|
|
|
2eb1afe9b2
|
Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test
Reviewed-on: #106
|
2023-11-23 16:42:37 +08:00 |
|
|
|
8cd53915c1
|
修改仓库UI测试bug
|
2023-11-23 16:42:09 +08:00 |
|
|
|
571d204d68
|
Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test
Reviewed-on: #105
|
2023-11-23 16:41:12 +08:00 |
|
helloDy
|
8dbc1d512d
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-23 15:10:26 +08:00 |
|
helloDy
|
8af06c6c42
|
bug
|
2023-11-23 15:09:46 +08:00 |
|
‘937886381’
|
afafbccc0c
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-23 14:33:32 +08:00 |
|
‘937886381’
|
0948737f1a
|
修改bug
|
2023-11-23 14:32:53 +08:00 |
|
|
|
0ce6bc07a0
|
Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test
Reviewed-on: #104
|
2023-11-22 17:09:03 +08:00 |
|
|
|
e318aa4f59
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-22 17:05:53 +08:00 |
|
|
|
ab09a2b08c
|
update zentao bugs
|
2023-11-22 17:04:22 +08:00 |
|
|
|
d2d5503792
|
Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test
Reviewed-on: #103
|
2023-11-22 17:01:21 +08:00 |
|
|
|
6940155e4f
|
merge test
|
2023-11-22 17:00:32 +08:00 |
|
|
|
dfc758bfae
|
订单监控图
|
2023-11-22 16:58:32 +08:00 |
|
|
|
ec2994e928
|
Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test
Reviewed-on: #102
|
2023-11-22 14:53:35 +08:00 |
|
helloDy
|
5492666b53
|
merge
|
2023-11-22 14:43:07 +08:00 |
|
|
|
cd55b4c860
|
update
|
2023-11-22 14:41:53 +08:00 |
|
helloDy
|
a7f811aa3e
|
bug
|
2023-11-22 14:41:10 +08:00 |
|
|
|
33188481bf
|
update login
|
2023-11-22 14:27:30 +08:00 |
|
|
|
0200fc08f1
|
Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test
Reviewed-on: #101
|
2023-11-22 14:14:03 +08:00 |
|
‘937886381’
|
a22da566c3
|
解决冲突
|
2023-11-22 14:11:23 +08:00 |
|
‘937886381’
|
3c99ddc4c0
|
修改bug
|
2023-11-22 14:00:02 +08:00 |
|
|
|
96705bd4d9
|
Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test
Reviewed-on: #100
|
2023-11-22 13:28:39 +08:00 |
|
|
|
ac28476024
|
update hints
|
2023-11-22 11:15:39 +08:00 |
|
|
|
1299a56e22
|
Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test
Reviewed-on: #99
|
2023-11-22 10:21:55 +08:00 |
|
|
|
b348a31b24
|
update some equipment bugs
|
2023-11-22 10:14:40 +08:00 |
|
|
|
67d639c413
|
Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test
Reviewed-on: #98
|
2023-11-21 17:03:52 +08:00 |
|
