Commit Graph

1405 Commits

Author SHA1 Message Date
43e824f958 Merge pull request 'projects/mesxc-dy' (#368) from projects/mesxc-dy into projects/mesxc-test
Some checks are pending
continuous-integration/drone/push Build is running
Reviewed-on: #368
2024-04-25 14:45:40 +08:00
helloDy
de831b339f Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-25 14:44:05 +08:00
helloDy
f0105c377c bug and 原片 2024-04-25 14:43:29 +08:00
3ba5574669 Merge pull request 'projects/mesxc-zhp' (#367) from projects/mesxc-zhp into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #367
2024-04-25 14:21:29 +08:00
‘937886381’
082988d6d7 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-25 13:57:11 +08:00
‘937886381’
7acb861919 修改bug 2024-04-25 13:56:49 +08:00
c41153a946 Merge pull request 'projects/mesxc-zjl' (#366) from projects/mesxc-zjl into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #366
2024-04-25 11:09:31 +08:00
6d658d9212 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-25 11:08:15 +08:00
bf4bab2f3c 烟气隐藏 2024-04-25 11:06:16 +08:00
20f0efa413 Merge pull request 'projects/mesxc-zhp' (#365) from projects/mesxc-zhp into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #365
2024-04-25 10:58:01 +08:00
‘937886381’
c48f81b1d9 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-25 10:19:25 +08:00
‘937886381’
7233720c2e 修改bug 2024-04-25 10:19:02 +08:00
6a491ff498 Merge pull request 'projects/mesxc-zhp' (#364) from projects/mesxc-zhp into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #364
2024-04-25 10:08:47 +08:00
‘937886381’
be607e4bf3 解决冲突 2024-04-25 10:07:19 +08:00
‘937886381’
87ef42e277 修改bug 2024-04-25 10:05:41 +08:00
aa65a7e97e Merge pull request 'projects/mesxc-dy' (#363) from projects/mesxc-dy into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #363
2024-04-25 10:01:22 +08:00
helloDy
b8d26c87d8 月报年报 2024-04-25 09:57:13 +08:00
b89f510e61 Merge pull request '1' (#362) from projects/mesxc-zjl into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #362
2024-04-25 09:13:09 +08:00
helloDy
0e60f426bc Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-25 09:11:00 +08:00
helloDy
21f4879394 date 2024-04-25 09:10:28 +08:00
067cd4765e 1 2024-04-25 09:04:29 +08:00
3c4fe6daaa Merge pull request 'projects/mesxc-dy' (#361) from projects/mesxc-dy into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #361
2024-04-25 08:42:57 +08:00
helloDy
e24f9c1079 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-25 08:40:38 +08:00
helloDy
61567ce86a 生产数据汇总 2024-04-25 08:40:08 +08:00
2ee66714ca Merge pull request '修改' (#360) from projects/mesxc-zjl into projects/mesxc-test
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #360
2024-04-24 17:06:02 +08:00
ab5867c4fd 修改 2024-04-24 17:05:19 +08:00
shr
9a53391999 👷 添加自动构建发布配置
Some checks failed
continuous-integration/drone/push Build is failing
2024-04-24 16:03:10 +08:00
ec0c09a674 Merge pull request 'projects/mesxc-zhp' (#358) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #358
2024-04-24 14:54:40 +08:00
‘937886381’
90e9b179eb Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-24 14:52:32 +08:00
‘937886381’
8e2b332c7b 修改bug 2024-04-24 14:52:01 +08:00
f37a12d2e1 Merge pull request '修改bug' (#357) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #357
2024-04-24 14:38:13 +08:00
cb19872012 Merge pull request 'projects/mesxc-zhp' (#356) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #356
2024-04-24 14:37:05 +08:00
‘937886381’
8ba79185d4 修改bug 2024-04-24 14:36:45 +08:00
‘937886381’
104cda5a41 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-24 14:34:08 +08:00
‘937886381’
151c5708c4 修改bug 2024-04-24 14:33:46 +08:00
837735b7e8 Merge pull request 'projects/mesxc-zhp' (#355) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #355
2024-04-24 14:25:03 +08:00
‘937886381’
e00a08385f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-24 14:23:47 +08:00
‘937886381’
a8c3d2c585 修改bug 2024-04-24 14:23:13 +08:00
eb097e77bd Merge pull request 'projects/mesxc-zhp' (#354) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #354
2024-04-24 13:50:44 +08:00
‘937886381’
30eecb8bd1 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-24 13:49:44 +08:00
‘937886381’
f4a6229170 修改bug 2024-04-24 13:49:23 +08:00
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
‘937886381’
22f3c87f02 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-23 16:47:49 +08:00
‘937886381’
1f54c9179d 修改bug 2024-04-23 16:47:27 +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