Commit Graph

305 Commits

Author SHA1 Message Date
1cc4c8f8a3 Merge pull request 'projects/mescc/zhp' (#28) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #28
2024-06-03 10:05:37 +08:00
‘937886381’
38b278530c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 08:57:56 +08:00
‘937886381’
7a9549bc8f 修改bug 2024-06-03 08:57:04 +08:00
5f2c85e4d7 Merge pull request 'projects/mescc/dy' (#27) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #27
2024-06-03 08:53:37 +08:00
helloDy
44283a049b merge 2024-06-03 08:52:30 +08:00
helloDy
da14d9f018 merge 2024-06-03 08:44:28 +08:00
00dd5b4bfe Merge pull request 'projects/mescc/zhp' (#25) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #25
2024-06-03 08:44:02 +08:00
helloDy
fe70138870 生产管理 2024-06-03 08:37:31 +08:00
‘937886381’
a5f8e72a78 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 08:24:18 +08:00
‘937886381’
38665c38bd 修改 2024-06-03 08:23:40 +08:00
edade214af Merge pull request 'projects/mescc/zhp' (#23) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2024-05-30 22:11:27 +08:00
‘937886381’
91fd1b09d5 工厂驾驶舱 2024-05-30 16:00:18 +08:00
‘937886381’
4569d047d7 解决冲突 2024-05-29 17:07:09 +08:00
‘937886381’
dc1667cdb7 产量和效率 2024-05-29 17:05:55 +08:00
9bd4ac5066 Merge pull request 'projects/mescc/zjl' (#22) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #22
2024-05-29 13:15:23 +08:00
4b0e8dfab6 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-29 13:14:43 +08:00
71a428f034 系统管理 2024-05-29 13:13:46 +08:00
05c170ba5e Merge pull request 'projects/mescc/dy' (#21) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
2024-05-22 16:52:01 +08:00
helloDy
8fd8c36b8a merge 2024-05-22 16:31:29 +08:00
helloDy
fe39f72045 生产管理 2024-05-22 16:28:47 +08:00
‘937886381’
5c05e6c2e4 修改ui 2024-05-21 09:13:52 +08:00
ab4d7a8e4b Merge pull request 'projects/mescc/zjl' (#20) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #20
2024-05-21 08:35:14 +08:00
3228987c40 1 2024-05-21 08:34:03 +08:00
e16915450b Merge pull request 'projects/mescc/dy' (#19) from projects/mescc/dy into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #19
2024-05-20 15:00:05 +08:00
helloDy
2061384d96 merge 2024-05-20 14:57:43 +08:00
f84355b673 mt 2024-05-20 14:56:35 +08:00
helloDy
14fa1823f2 生产管理 2024-05-20 14:55:36 +08:00
aec811827d 1 2024-05-20 14:54:18 +08:00
ee35987b0a Merge pull request 'projects/mescc/zhp' (#18) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #18
2024-05-20 14:53:24 +08:00
‘937886381’
cb7cd0df81 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-20 13:33:15 +08:00
‘937886381’
923323a8df 修改bug 2024-05-20 13:32:36 +08:00
7459ca0019 Merge pull request 'projects/mescc/zhp' (#17) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #17
2024-05-20 10:23:10 +08:00
‘937886381’
83ad88858b 驾驶舱 2024-05-20 10:20:37 +08:00
‘937886381’
5a9ce24451 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-17 10:32:33 +08:00
‘937886381’
208af7b565 驾驶舱对接 2024-05-17 10:31:47 +08:00
18e50722b0 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-14 15:19:51 +08:00
34bf9f91cf 角色管理 2024-05-14 15:18:44 +08:00
5b33fe539c Merge pull request 'projects/mescc/zhp' (#16) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #16
2024-05-14 08:49:23 +08:00
‘937886381’
6f0c8503c6 修改bug 2024-05-14 08:46:58 +08:00
‘937886381’
097bab8241 修改bug 2024-05-13 16:20:37 +08:00
‘937886381’
46d7f4cb8a Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-13 13:46:19 +08:00
‘937886381’
ad8e6972fb 驾驶舱 2024-05-13 13:45:33 +08:00
85239a633d Merge pull request 'projects/mescc/zhp' (#15) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2024-05-11 16:47:52 +08:00
‘937886381’
b28018a7a2 修改 2024-05-11 16:45:00 +08:00
‘937886381’
8a5b0f2857 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-11 16:41:25 +08:00
‘937886381’
56e011c179 驾驶舱 2024-05-11 16:40:29 +08:00
e918fab8d4 Merge pull request 'projects/mescc/zjl' (#14) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #14
2024-05-11 11:16:37 +08:00
ca21a0cbed 首页 2024-05-11 11:15:17 +08:00
dd7c5f11ab Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-10 13:22:06 +08:00
b18a7a8fb4 Merge pull request 'projects/mescc/zhp' (#13) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #13
2024-05-10 11:13:43 +08:00