Commit Graph

362 Commits

Author SHA1 Message Date
3897f35d28 Merge pull request 'projects/mescc/zhp' (#61) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #61
2024-06-24 13:30:57 +08:00
3c6e408074 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-24 13:27:57 +08:00
a9392c8999 1 2024-06-24 13:27:09 +08:00
‘937886381’
196a615f61 修改bug 2024-06-24 10:44:21 +08:00
‘937886381’
8395f37371 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-24 10:39:42 +08:00
‘937886381’
5e703350e1 修改bug 2024-06-24 10:39:10 +08:00
266604878b Merge pull request 'projects/mescc/zhp' (#60) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #60
2024-06-24 09:50:07 +08:00
‘937886381’
0c2221b373 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-24 09:48:30 +08:00
‘937886381’
0992940655 修改bug 2024-06-24 09:48:06 +08:00
7e1b0f8725 Merge pull request 'projects/mescc/zjl' (#59) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #59
2024-06-24 09:17:14 +08:00
8f8d0396b7 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-24 09:16:37 +08:00
582484f6db 时间 2024-06-24 09:15:51 +08:00
b259cdb545 Merge pull request 'projects/mescc/zjl' (#58) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #58
2024-06-21 16:21:40 +08:00
b6aa6a19f4 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-21 16:21:02 +08:00
a9e176be74 1 2024-06-21 16:20:14 +08:00
a237c66901 Merge pull request 'projects/mescc/zhp' (#57) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #57
2024-06-21 16:19:01 +08:00
‘937886381’
c7205e32a3 报表 2024-06-21 16:17:25 +08:00
‘937886381’
b180bac226 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-21 16:05:33 +08:00
‘937886381’
670d7e5600 报表 2024-06-21 16:04:50 +08:00
69b3e7de2e Merge pull request 'projects/mescc/zhp' (#56) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #56
2024-06-21 10:42:43 +08:00
‘937886381’
0eb17fa08b 报表 2024-06-20 20:54:34 +08:00
‘937886381’
cc800eae5d Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-20 20:38:45 +08:00
‘937886381’
6be1a83dd8 报表 2024-06-20 20:38:11 +08:00
033d61ea96 Merge pull request 'projects/mescc/zjl' (#55) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #55
2024-06-20 17:10:00 +08:00
4fb88a5201 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-20 17:08:51 +08:00
0e60ba7dc8 1 2024-06-20 17:07:57 +08:00
1969cd3ada Merge pull request 'projects/mescc/dy' (#54) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #54
2024-06-20 16:58:00 +08:00
helloDy
510f12e40b Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-20 16:54:45 +08:00
helloDy
7a67da105f bug 2024-06-20 16:54:14 +08:00
6c145579cb Merge pull request '1' (#53) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #53
2024-06-20 16:52:26 +08:00
e512ad5858 1 2024-06-20 16:51:44 +08:00
a7b13c6a8f Merge pull request 'projects/mescc/zjl' (#52) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #52
2024-06-20 15:25:01 +08:00
0655eafb1d Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-20 15:24:20 +08:00
ce350c0c7f 剩余报表 2024-06-20 15:23:05 +08:00
abfd20bac6 Merge pull request 'projects/mescc/zjl' (#51) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #51
2024-06-19 16:52:26 +08:00
7ba831f496 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-19 16:51:33 +08:00
78d387b2c6 1 2024-06-19 16:50:44 +08:00
‘937886381’
15d3b3622c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-19 16:26:17 +08:00
‘937886381’
c8bc54e04b 报表 2024-06-19 16:25:50 +08:00
a5d0970fa0 Merge pull request 'projects/mescc/dy' (#50) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #50
2024-06-19 16:07:14 +08:00
helloDy
2368916e62 merge 2024-06-19 16:06:12 +08:00
helloDy
2d5bd161f3 生产数据管理 2024-06-19 16:04:42 +08:00
ff424ca1b6 Merge pull request '对接报表' (#49) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #49
2024-06-19 16:01:50 +08:00
9de0dfc639 对接报表 2024-06-19 16:01:13 +08:00
fc0a97a9c6 Merge pull request 'projects/mescc/zjl' (#48) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #48
2024-06-19 08:50:56 +08:00
45538e80c4 mt 2024-06-19 08:50:24 +08:00
be75dd0702 报表2页面 2024-06-19 08:48:48 +08:00
6233ca4dca Merge pull request 'projects/mescc/zhp' (#47) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #47
2024-06-18 16:03:14 +08:00
‘937886381’
41d554f897 修改bug 2024-06-18 15:55:48 +08:00
‘937886381’
d95853dec2 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-18 10:25:39 +08:00