Commit Graph

1362 Commits

Author SHA1 Message Date
ab593bff20 Merge pull request 'projects/mesxc-zjl' (#353) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #353
2024-04-24 13:32:26 +08:00
4b01dd3ec3 merge test 2024-04-24 13:31:55 +08:00
ed3ea7dde8 Merge pull request 'projects/mesxc-dy' (#352) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #352
2024-04-24 13:30:39 +08:00
1d9e272f99 驾驶舱 2024-04-24 13:30:06 +08:00
helloDy
43c9153777 冲突 2024-04-23 17:25:39 +08:00
helloDy
c6d504583b 生产数据汇总表 2024-04-23 17:23:54 +08:00
f7247f5161 Merge pull request 'projects/mesxc-zhp' (#351) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #351
2024-04-23 16:28:30 +08:00
‘937886381’
c8856f34b5 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-23 16:19:23 +08:00
‘937886381’
42c42abc08 新增报表 2024-04-23 16:19:01 +08:00
0fffed9b0e Merge pull request 'projects/mesxc-zhp' (#350) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #350
2024-04-23 15:26:03 +08:00
‘937886381’
d251daa3f5 修改bug 2024-04-23 15:23:43 +08:00
‘937886381’
ed5120ca97 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-23 15:09:42 +08:00
‘937886381’
becf34d089 修改bug 2024-04-23 15:09:07 +08:00
f0d64de77b Merge pull request 'projects/mesxc-zjl' (#349) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #349
2024-04-23 14:44:04 +08:00
56819176b3 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-23 14:43:32 +08:00
d302179f6f Merge pull request 'projects/mesxc-zhp' (#348) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #348
2024-04-23 14:42:19 +08:00
8c117fae8e 报表 2024-04-23 14:42:02 +08:00
‘937886381’
b6cf7b2ddc 剞劂冲突 2024-04-23 13:53:33 +08:00
‘937886381’
2f98b42bd2 新增报表 2024-04-23 13:52:10 +08:00
fb8ae9226a Merge pull request 'projects/mesxc-zjl' (#347) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #347
2024-04-23 09:13:51 +08:00
3d3763c4ef merge test 2024-04-23 09:13:29 +08:00
ea675b9dea Merge pull request 'projects/mesxc-zhp' (#346) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #346
2024-04-23 09:11:45 +08:00
bda065e4be 报表 2024-04-23 09:11:14 +08:00
‘937886381’
5ea4c219ed 新增报表 2024-04-22 17:14:59 +08:00
helloDy
16186667da merge 2024-04-22 15:20:56 +08:00
helloDy
c7cd6e7b1e 部门换接口 2024-04-22 15:19:35 +08:00
‘937886381’
29c3a9fb72 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-22 08:55:20 +08:00
‘937886381’
1e1313d090 修改bug 2024-04-22 08:54:55 +08:00
d0eb1d84c8 Merge pull request 'projects/mesxc-zhp' (#344) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #344
2024-04-19 17:02:23 +08:00
‘937886381’
445d8f4818 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-19 17:01:17 +08:00
‘937886381’
46ce982cfc 新增报表 2024-04-19 16:59:47 +08:00
391e06a382 Merge pull request 'projects/mesxc-zjl' (#342) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #342
2024-04-19 11:11:19 +08:00
72e1b4e8f9 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-19 11:10:38 +08:00
b41ba04cb4 Merge pull request 'projects/mesxc-zhp' (#341) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #341
2024-04-19 11:09:12 +08:00
‘937886381’
4482ce0433 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-19 11:07:43 +08:00
‘937886381’
ecf6745c8a 报表新增 2024-04-19 11:07:14 +08:00
c9128ce946 包装40% 2024-04-19 11:03:50 +08:00
ba08175de8 Merge pull request 'projects/mesxc-zhp' (#340) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #340
2024-04-17 16:36:22 +08:00
‘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
59d53b60c7 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-17 13:23:20 +08:00
d448280782 test 2024-04-16 15:29:39 +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