Commit Graph

1322 Commits

Author SHA1 Message Date
‘937886381’
22f8322baf Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-17 16:16:37 +08:00
‘937886381’
6f8abc9758 修改ui 2024-04-17 16:15:59 +08:00
0337b54202 Merge pull request 'projects/mesxc-zhp' (#339) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #339
2024-04-16 14:07:17 +08:00
‘937886381’
9dec81e0b2 修改ui 2024-04-16 14:04:43 +08:00
‘937886381’
64de2c50b6 修改bug 2024-04-16 13:52:38 +08:00
‘937886381’
bd0f9e24fd Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-16 13:46:08 +08:00
‘937886381’
f3043ee11f 修改ui 2024-04-16 13:45:38 +08:00
5584a47575 Merge pull request 'projects/mesxc-zjl' (#337) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #337
2024-04-15 14:59:29 +08:00
b0078cb099 1 2024-04-15 14:49:28 +08:00
e5acd497b5 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-15 09:35:46 +08:00
6b452dce36 能源bug 2024-04-15 09:35:00 +08:00
aacf87f6d3 Merge pull request 'projects/mesxc-zhp' (#336) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #336
2024-04-15 09:31:35 +08:00
‘937886381’
bfa17e422d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-15 09:29:29 +08:00
‘937886381’
e25f872589 修改ui 2024-04-15 09:28:49 +08:00
83b834d2fc Merge pull request 'projects/mesxc-zjl' (#335) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #335
2024-04-12 17:02:46 +08:00
1b2c16fcdb Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-12 17:01:59 +08:00
475ec35ec5 1 2024-04-12 16:59:34 +08:00
1328da9616 Merge pull request 'projects/mesxc-lb' (#334) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #334
2024-04-12 16:50:11 +08:00
lb
92b9ec7da7 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-04-12 16:46:20 +08:00
c1af47db81 Merge pull request 'projects/mesxc-zhp' (#333) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #333
2024-04-12 16:44:38 +08:00
lb
15afbcd612 bugfix 特殊设备权限 2024-04-12 16:40:15 +08:00
‘937886381’
dabbc6b63a 修改bug 2024-04-12 15:27:01 +08:00
‘937886381’
cfab3353d3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-12 15:18:43 +08:00
‘937886381’
2298fc56b6 修改bug 2024-04-12 15:17:21 +08:00
bb77d0f8c6 Merge pull request 'projects/mesxc-zhp' (#332) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #332
2024-04-12 14:58:10 +08:00
‘937886381’
e8938a62eb 解决冲突 2024-04-12 14:31:56 +08:00
‘937886381’
2a599d96b3 修改bug 2024-04-12 14:30:11 +08:00
‘937886381’
6050eb4df5 修改bug 2024-04-12 14:27:51 +08:00
lb
02c3b3db0d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-04-12 13:53:50 +08:00
3308fcbef9 Merge pull request 'projects/mesxc-zjl' (#331) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #331
2024-04-12 11:21:05 +08:00
cb7135bad5 merge test 2024-04-12 11:16:15 +08:00
4a56f92961 Merge pull request 'projects/mesxc-dy' (#330) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #330
2024-04-12 11:10:01 +08:00
helloDy
8f11c2f47c Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-12 11:05:44 +08:00
helloDy
b41dc9593c 权限22 2024-04-12 11:05:11 +08:00
862fe20760 能源bug 2024-04-12 08:56:32 +08:00
1ed409a98e Merge pull request 'projects/mesxc-zhp' (#329) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #329
2024-04-11 16:55:43 +08:00
68e738cf12 Merge pull request 'projects/mesxc-dy' (#328) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #328
2024-04-11 16:55:03 +08:00
‘937886381’
4866198a98 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-11 16:54:49 +08:00
‘937886381’
49df8a72bd 修改bug 2024-04-11 16:54:22 +08:00
helloDy
087af452de Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-11 16:54:02 +08:00
helloDy
63a753d7d6 权限 2024-04-11 16:49:48 +08:00
b1cdf083dd Merge pull request 'projects/mesxc-zjl' (#327) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #327
2024-04-11 15:37:55 +08:00
673ddcb996 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-11 15:36:54 +08:00
a9e60dbe82 Merge pull request 'projects/mesxc-zhp' (#326) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #326
2024-04-11 15:28:36 +08:00
‘937886381’
92d197a513 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-11 15:27:11 +08:00
‘937886381’
e7f440a142 修改bug 2024-04-11 15:26:51 +08:00
5d3622bf62 权限 2024-04-11 15:22:09 +08:00
5ccb9297e1 4.11 2024-04-11 11:18:08 +08:00
ce528f18b6 Merge pull request 'projects/mesxc-zhp' (#325) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #325
2024-04-11 11:16:10 +08:00
‘937886381’
024060182e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-11 11:04:14 +08:00