Commit Graph

579 Commits

Author SHA1 Message Date
0a91161afe merge test 2024-02-02 14:39:11 +08:00
896675a3e9 环保管理数据修饰 2024-02-02 14:29:20 +08:00
‘937886381’
009cf3b8e6 合并冲突 2024-02-01 16:49:53 +08:00
‘937886381’
5098555a5e 修改bug 2024-02-01 16:48:58 +08:00
2a504a715f merge test 2024-02-01 14:31:57 +08:00
1bbd9b1e3a 班组 2024-02-01 14:24:12 +08:00
‘937886381’
39aaf82345 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:11:45 +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
‘937886381’
c7ec6da39c 修改bug 2024-01-29 16:50:05 +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
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
‘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
21dc0412e3 merge test 2024-01-25 17:20:44 +08:00
6c837a7006 能源手动抄表 2024-01-25 17:18:40 +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
ebe926b83e merge test 2024-01-25 09:09:58 +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’
c47dddfcdc 修改bug 2024-01-24 17:16:05 +08:00
‘937886381’
d5b1d418a8 修改bug 2024-01-23 16:22:25 +08:00
‘937886381’
7534ab7817 修改bug 2024-01-18 14:10:49 +08:00
820d503d8d merge test 2024-01-18 14:07:48 +08:00
e1015e382f 添加时间 2024-01-18 14:05:39 +08:00
‘937886381’
bee302b08e 修改图例 2024-01-17 15:30:47 +08:00
‘937886381’
d230508e9c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-17 09:25:44 +08:00
2e5ba8a891 merge test 2024-01-17 09:12:43 +08:00
a637977e12 ui测试修改 2024-01-17 09:11:02 +08:00
‘937886381’
c3b747d019 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-16 16:10:18 +08:00
‘937886381’
7ac9b6d35f 修改bug 2024-01-16 16:09:52 +08:00
3aa7825c56 merge test 2024-01-12 13:29:11 +08:00
cd416d7d01 订单监控加分页&驾驶舱样式调整 2024-01-12 11:23:14 +08:00
‘937886381’
d06784c2c3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-12 10:00:41 +08:00
‘937886381’
44ca0595ec 假数据 2024-01-12 10:00:17 +08:00
90be2a826b 驾驶舱修改 2024-01-12 09:45:36 +08:00
02e506c7d6 1 2024-01-11 14:31:23 +08:00
09adddb69e merge test 2024-01-11 13:59:43 +08:00
6c02990cb5 驾驶舱提测ui 2024-01-11 13:44:38 +08:00
lb
5d157505aa update 2024-01-11 09:05:31 +08:00
lb
44b45a6a04 merge test 2024-01-11 09:02:56 +08:00
lb
593c9f7d60 bugfix 240110qun 2024-01-10 11:27:04 +08:00
‘937886381’
95b70b2415 修改bug 2024-01-09 16:35:07 +08:00
‘937886381’
040b76d276 解决冲突 2024-01-09 16:26:14 +08:00