Commit Graph

235 Commits

Author SHA1 Message Date
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
‘937886381’
eacf93e0db 修改bug 2024-06-18 10:25:13 +08:00
1e941180b0 Merge pull request 'projects/mescc/dy' (#46) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #46
2024-06-18 08:49:31 +08:00
helloDy
7f379f2589 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-18 08:48:31 +08:00
helloDy
e990680159 bug 2024-06-18 08:47:53 +08:00
d6cb371c68 Merge pull request 'projects/mescc/zhp' (#45) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #45
2024-06-18 08:46:50 +08:00
‘937886381’
731243636f Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-17 17:00:11 +08:00
‘937886381’
14c782f112 修改 2024-06-17 16:59:41 +08:00
2b3db710c1 Merge pull request 'projects/mescc/zhp' (#44) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #44
2024-06-17 15:36:53 +08:00
‘937886381’
0ef7c9808c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-17 15:35:14 +08:00
‘937886381’
f241a35252 修改 2024-06-17 15:34:37 +08:00
89b71d5aa2 报表样式2.0 2024-06-17 13:40:30 +08:00
e9d17e0f82 Merge pull request 'projects/mescc/dy' (#43) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #43
2024-06-17 09:19:57 +08:00
helloDy
e1e39681ce merge 2024-06-17 09:01:58 +08:00
helloDy
2d49bfe10e bug 2024-06-17 09:00:07 +08:00
6bd65b19f9 Merge pull request 'projects/mescc/zhp' (#42) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #42
2024-06-14 10:22:16 +08:00
‘937886381’
03dd862cb4 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-14 10:18:46 +08:00
‘937886381’
f14e9d7408 修改bug 2024-06-14 10:18:20 +08:00
7232486f8d Merge pull request '报表样式' (#41) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #41
2024-06-13 17:13:17 +08:00
2ab8acd4ca 报表样式 2024-06-13 17:12:50 +08:00
9adeb160c1 Merge pull request 'projects/mescc/zjl' (#40) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #40
2024-06-13 15:41:35 +08:00
05b5814907 报表 2024-06-13 15:36:02 +08:00
3d7e3d828c Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-12 13:28:22 +08:00
5f98f4a361 产量对标FTo 2024-06-12 13:27:09 +08:00
76c95f7048 Merge pull request '新增报表' (#39) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #39
2024-06-11 14:34:26 +08:00
‘937886381’
fad6028469 新增报表 2024-06-11 14:08:32 +08:00
ae520f84d0 Merge pull request 'projects/mescc/zhp' (#38) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #38
2024-06-07 16:02:08 +08:00
‘937886381’
b40414b837 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 14:56:26 +08:00