Commit Graph

1447 Commits

Author SHA1 Message Date
‘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
‘937886381’
4f111a95d6 修改看板 2024-04-11 11:03:48 +08:00
8fc6b73179 Merge pull request 'projects/mesxc-zjl' (#324) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #324
2024-04-10 17:39:29 +08:00
7f504e5cdd Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-10 17:37:50 +08:00
7c5d8bde0b 能源权限 2024-04-10 17:36:37 +08:00
‘937886381’
0b1761e83c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-10 16:52:56 +08:00
‘937886381’
cafa156d72 更改需求 2024-04-10 16:52:18 +08:00
ed46ed7d09 Merge pull request 'projects/mesxc-zhp' (#323) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #323
2024-04-10 16:26:37 +08:00
‘937886381’
f89c6dfe14 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-10 16:12:23 +08:00
‘937886381’
a3b2eae33f 深加工新需求 2024-04-10 16:11:29 +08:00
e70ff40554 Merge pull request '修改成本新的权限字段' (#322) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #322
2024-04-10 14:49:44 +08:00
zwq
d3d93acd0f 修改成本新的权限字段 2024-04-10 14:48:37 +08:00
93236f9828 移除部分监听 2024-04-10 14:17:30 +08:00
‘937886381’
fef8824844 修改bug 2024-04-09 16:05:28 +08:00
a4fceeb981 Merge pull request 'projects/mesxc-zjl' (#321) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #321
2024-04-09 13:09:55 +08:00
84468cc883 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-09 13:06:21 +08:00
ea04d55fc1 驾驶舱 2024-04-09 13:04:40 +08:00
ef1078360a Merge pull request '更新成本' (#319) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #319
2024-04-09 11:06:14 +08:00
zwq
60f6c3a8fe 更新成本 2024-04-09 11:05:37 +08:00
a4b340ac5d Merge pull request 'projects/mesxc-dy' (#318) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #318
2024-04-09 08:18:01 +08:00
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
abcec3bcdc Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-08 16:38:59 +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