Commit Graph

157 Commits

Author SHA1 Message Date
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
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
b0f979318b Merge pull request 'projects/mescc/dy' (#37) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2024-06-07 14:55:58 +08:00
‘937886381’
db70699a6b Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 14:49:01 +08:00
‘937886381’
a2e73b25ce 修改 2024-06-07 14:48:33 +08:00
helloDy
0a10b7f177 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-07 14:16:51 +08:00
helloDy
39cb9acfec 工单 2024-06-07 14:16:20 +08:00
3df0ab48de Merge pull request 'projects/mescc/zhp' (#36) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2024-06-07 11:18:49 +08:00
‘937886381’
9854dd83b2 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 11:14:42 +08:00
‘937886381’
ef618a4abb 修改bug 2024-06-07 11:13:59 +08:00
40c7aaa323 Merge pull request 'projects/mescc/dy' (#35) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #35
2024-06-05 16:46:34 +08:00
helloDy
1a3599a42b Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-05 16:43:31 +08:00
helloDy
8a08846198 bug 工单详情 2024-06-05 16:42:54 +08:00
6d6f73e7d2 Merge pull request 'projects/mescc/zhp' (#34) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #34
2024-06-05 15:05:23 +08:00
‘937886381’
1e8d60696b Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-05 14:30:51 +08:00
‘937886381’
ba0ba04182 修改首页 2024-06-05 14:30:05 +08:00
6a9acc13ae Merge pull request 'projects/mescc/zhp' (#33) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2024-06-05 14:16:55 +08:00
‘937886381’
035bf0e095 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-05 14:14:44 +08:00
‘937886381’
69f953fb0c 修改 2024-06-05 14:14:12 +08:00
d43a53e7f5 Merge pull request '修改bug' (#32) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2024-06-04 15:43:44 +08:00
7fc6ed87a4 修改bug 2024-06-04 15:43:00 +08:00
006d44b842 Merge pull request 'projects/mescc/zjl' (#31) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #31
2024-06-04 09:09:27 +08:00
7c6949dfa0 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 09:08:07 +08:00
78f7784f23 router 2024-06-04 09:07:23 +08:00
7d7e4314e9 Merge pull request 'projects/mescc/dy' (#30) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #30
2024-06-04 08:57:54 +08:00
helloDy
c77130603e merge 2024-06-04 08:56:52 +08:00
helloDy
7cb8abd618 滚动条 2024-06-04 08:55:45 +08:00
c6169afaec Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 08:36:06 +08:00
ff98ad35c5 logo图标等 2024-06-04 08:35:23 +08:00
acb87e86a1 Merge pull request 'projects/mescc/zhp' (#29) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #29
2024-06-03 16:44:17 +08:00