Commit Graph

810 Commits

Author SHA1 Message Date
63e77eb3cb 修改驾驶舱能源日期 2024-02-06 16:13:19 +08:00
967fed392d Merge pull request 'projects/mesxc-zjl' (#198) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #198
2024-02-02 14:40:25 +08:00
0a91161afe merge test 2024-02-02 14:39:11 +08:00
896675a3e9 环保管理数据修饰 2024-02-02 14:29:20 +08:00
6793ac7c50 Merge pull request 'projects/mesxc-zhp' (#197) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #197
2024-02-01 16:52:02 +08:00
‘937886381’
009cf3b8e6 合并冲突 2024-02-01 16:49:53 +08:00
‘937886381’
5098555a5e 修改bug 2024-02-01 16:48:58 +08:00
26bf5165df Merge pull request 'projects/mesxc-zjl' (#196) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #196
2024-02-01 14:32:49 +08:00
2a504a715f merge test 2024-02-01 14:31:57 +08:00
1bbd9b1e3a 班组 2024-02-01 14:24:12 +08:00
61b6ceb965 Merge pull request 'projects/mesxc-zhp' (#195) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #195
2024-01-30 18:12:45 +08:00
‘937886381’
39aaf82345 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:11:45 +08:00
4f810ee26a Merge pull request 'projects/mesxc-dy' (#194) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #194
2024-01-30 18:11:01 +08:00
‘937886381’
4dceaca2e3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:09:26 +08:00
‘937886381’
7ad64c7611 安灯权限管理 2024-01-30 18:08:59 +08:00
helloDy
0eae057ddc Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-01-30 14:17:24 +08:00
helloDy
101dc1807e 时间提示 2024-01-30 14:13:35 +08:00
32b7abea82 Merge pull request 'projects/mesxc-zhp' (#193) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #193
2024-01-29 16:51:47 +08:00
‘937886381’
fe836b36ce Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-29 16:50:43 +08:00
‘937886381’
c7ec6da39c 修改bug 2024-01-29 16:50:05 +08:00
ccce85ce21 Merge pull request 'projects/mesxc-zhp' (#192) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #192
2024-01-29 15:59:39 +08:00
‘937886381’
204e200102 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-29 15:56:02 +08:00
‘937886381’
1045a5fbb0 修改看板 2024-01-29 15:55:16 +08:00
7a98ee1d0c Merge pull request 'projects/mesxc-dy' (#191) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #191
2024-01-26 09:33:12 +08:00
helloDy
62f1901c72 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-01-26 09:25:32 +08:00
helloDy
59c62fcb9c 24h 2024-01-26 09:24:54 +08:00
029a2fa6d7 Merge pull request 'projects/mesxc-zhp' (#190) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #190
2024-01-26 08:39:22 +08:00
‘937886381’
bd0636b458 修改bug 2024-01-26 08:37:06 +08:00
‘937886381’
77361c3d5f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-25 17:57:06 +08:00
‘937886381’
41e0d34551 修改bug 2024-01-25 17:56:37 +08:00
a7dd966e3f Merge pull request 'projects/mesxc-zjl' (#189) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #189
2024-01-25 17:21:16 +08:00
21dc0412e3 merge test 2024-01-25 17:20:44 +08:00
6c837a7006 能源手动抄表 2024-01-25 17:18:40 +08:00
720849ba7d Merge pull request 'projects/mesxc-zhp' (#188) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #188
2024-01-25 16:28:11 +08:00
‘937886381’
f84d66dd7f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-25 16:11:03 +08:00
‘937886381’
459d9268a0 修改bug 2024-01-25 16:10:31 +08:00
2c34573e28 Merge pull request 'projects/mesxc-zjl' (#187) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #187
2024-01-25 09:11:16 +08:00
ebe926b83e merge test 2024-01-25 09:09:58 +08:00
16e5142ab5 Merge pull request 'projects/mesxc-zhp' (#186) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #186
2024-01-25 09:05:19 +08:00
2eb21ba31f merge test 2024-01-25 09:01:42 +08:00
4918008a47 修改深加工产线产量及良品率 2024-01-25 08:59:21 +08:00
‘937886381’
c1ca2db161 修改bug 2024-01-24 17:17:50 +08:00
‘937886381’
44bc4a4659 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-24 17:16:27 +08:00
‘937886381’
c47dddfcdc 修改bug 2024-01-24 17:16:05 +08:00
778ebf6906 Merge pull request 'projects/mesxc-zhp' (#185) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #185
2024-01-23 16:33:24 +08:00
‘937886381’
3bc12b8830 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-23 16:22:53 +08:00
‘937886381’
d5b1d418a8 修改bug 2024-01-23 16:22:25 +08:00
ac3957e0c7 Merge pull request 'projects/mesxc-zhp' (#184) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #184
2024-01-18 14:13:06 +08:00
‘937886381’
05ce0dbd84 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-18 14:11:10 +08:00
‘937886381’
7534ab7817 修改bug 2024-01-18 14:10:49 +08:00