Commit Graph

1252 Commits

Author SHA1 Message Date
helloDy
2592551e66 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-08 17:03:21 +08:00
helloDy
1fde96e677 工单bug,改动 2024-04-08 17:02:55 +08:00
0b16e1fe0d Merge pull request '驾驶舱修改' (#317) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #317
2024-04-08 16:39:30 +08:00
bdd14eec70 驾驶舱修改 2024-04-08 16:38:12 +08:00
44e7e219a4 Merge pull request 'projects/mesxc-zhp' (#316) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #316
2024-04-08 16:37:26 +08:00
‘937886381’
ec51beb8ea Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-08 15:14:37 +08:00
‘937886381’
433618e71d 修改bug 2024-04-08 15:13:52 +08:00
812b72f10d Merge pull request 'projects/mesxc-zhp' (#315) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #315
2024-04-08 15:11:34 +08:00
‘937886381’
05f10ab51d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-08 14:49:46 +08:00
‘937886381’
e7828fd277 修改bug 2024-04-08 14:49:20 +08:00
58457487d1 Merge pull request 'projects/mesxc-zhp' (#314) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #314
2024-04-08 14:09:52 +08:00
‘937886381’
6c54c223c5 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-08 13:55:56 +08:00
‘937886381’
b2cc509f8e 权限 2024-04-08 13:55:22 +08:00
b6236e89b1 Merge pull request '1' (#313) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #313
2024-04-08 12:26:34 +08:00
cbc7cbc574 1 2024-04-08 12:25:44 +08:00
b5b952e1cc Merge pull request 'projects/mesxc-zjl' (#312) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #312
2024-04-08 10:44:09 +08:00
33ed9f15fa Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-08 10:42:42 +08:00
c85c6e4323 能源 2024-04-08 10:41:43 +08:00
30d22b34e1 Merge pull request '成本按钮权限' (#311) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #311
2024-04-08 09:05:52 +08:00
zwq
3d3fa2ccee 成本按钮权限 2024-04-08 09:05:10 +08:00
f960ece594 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-07 16:14:52 +08:00
949675b3a2 1 2024-04-07 16:13:57 +08:00
f52815abe6 Merge pull request 'projects/mesxc-zhp' (#310) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #310
2024-04-07 16:09:32 +08:00
‘937886381’
ac4cea0c7e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-07 16:07:30 +08:00
‘937886381’
93fea84c79 修改bug 2024-04-07 16:07:04 +08:00
a06682de3f Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-07 15:41:17 +08:00
e1773dae03 1 2024-04-07 15:39:26 +08:00
f6d866907c Merge pull request 'projects/mesxc-zjl' (#309) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #309
2024-04-07 12:19:50 +08:00
7fe8d7e72c 能源手动抄表 2024-04-07 12:18:52 +08:00
1e4a33a703 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-07 08:40:39 +08:00
d1ad913bab Merge pull request 'projects/mesxc-zhp' (#308) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #308
2024-04-03 18:14:55 +08:00
‘937886381’
38edf00925 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 18:13:55 +08:00
‘937886381’
bf231f7157 修改ui 2024-04-03 18:13:31 +08:00
04e2471a54 Merge pull request 'projects/mesxc-zhp' (#307) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #307
2024-04-03 17:37:34 +08:00
‘937886381’
9e2ce5f636 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 17:20:40 +08:00
‘937886381’
8a54c046d9 修改ui 2024-04-03 17:20:14 +08:00
3fa702cc12 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:45:18 +08:00
8ebff703ee Merge pull request 'projects/mesxc-zhp' (#306) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #306
2024-04-03 16:36:41 +08:00
‘937886381’
02e267e647 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 16:34:39 +08:00
‘937886381’
a6ffba4cf8 修改bug 2024-04-03 16:34:15 +08:00
3de4d5c5f2 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:33:32 +08:00
c6c2d1c3b1 Merge pull request 'projects/mesxc-zhp' (#305) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #305
2024-04-03 16:31:31 +08:00
‘937886381’
1bbd749094 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 16:30:35 +08:00
‘937886381’
073b4b8e20 修改bug 2024-04-03 16:30:09 +08:00
3ec82a6a41 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:27:32 +08:00
7c83268e0c 能源类型 2024-04-03 16:05:27 +08:00
49cb1e6877 Merge pull request 'projects/mesxc-zhp' (#304) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #304
2024-04-03 16:04:07 +08:00
‘937886381’
481dde003a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 16:01:37 +08:00
‘937886381’
43e54e8ee7 修改bug 2024-04-03 16:01:11 +08:00
28dbe075a4 Merge pull request 'projects/mesxc-dy' (#303) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #303
2024-04-03 15:11:41 +08:00