|
|
5ec45b87ca
|
Merge pull request 'fzq' (#75) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #75
|
2022-03-18 15:03:46 +08:00 |
|
Fanzink
|
445ad7f280
|
Merge branch 'develop' into fzq
|
2022-03-18 15:01:06 +08:00 |
|
Fanzink
|
15f9fb0f5b
|
'改bug更新'
|
2022-03-18 15:00:32 +08:00 |
|
|
|
114bfeccf3
|
Merge pull request '修改bug' (#74) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #74
|
2022-03-18 09:50:40 +08:00 |
|
|
|
018695fe70
|
修改bug
|
2022-03-18 09:49:30 +08:00 |
|
|
|
9aaffbb8b4
|
Merge pull request '修改bug' (#73) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #73
|
2022-03-17 16:22:39 +08:00 |
|
|
|
2a2bd1d726
|
修改bug
|
2022-03-17 16:21:35 +08:00 |
|
|
|
dd029f2055
|
Merge pull request 'eqtyep default' (#72) from gtz into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #72
|
2022-03-17 14:01:10 +08:00 |
|
|
|
fe54918801
|
eqtyep default
|
2022-03-17 14:00:36 +08:00 |
|
|
|
ced191b4df
|
Merge pull request '修改仓库样式' (#71) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #71
|
2022-03-17 10:59:56 +08:00 |
|
|
|
995db83484
|
修改仓库样式
|
2022-03-17 10:59:00 +08:00 |
|
|
|
40f426f7f5
|
Merge pull request 'base eq add' (#70) from gtz into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #70
|
2022-03-17 10:57:00 +08:00 |
|
|
|
61270a542d
|
base eq
|
2022-03-17 10:56:24 +08:00 |
|
|
|
3ecaa99a8c
|
Merge branch 'develop' into gtz
|
2022-03-17 10:52:41 +08:00 |
|
|
|
79238fca27
|
1
|
2022-03-17 10:52:22 +08:00 |
|
|
|
73d8951bbb
|
Merge pull request '首页对接以及库位详情' (#69) from gtz into develop
continuous-integration/drone/push Build is failing
Reviewed-on: #69
|
2022-03-16 20:12:20 +08:00 |
|
|
|
2f19b50e20
|
merge and update dashboard detail
|
2022-03-16 20:11:30 +08:00 |
|
|
|
6d4594b338
|
update
|
2022-03-16 19:14:00 +08:00 |
|
|
|
d4168e6157
|
Merge pull request '修改bug' (#68) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #68
|
2022-03-16 16:19:42 +08:00 |
|
|
|
dfb1f3d97b
|
修改bug
|
2022-03-16 16:18:59 +08:00 |
|
|
|
26772a324a
|
Merge pull request 'fzq' (#67) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #67
|
2022-03-16 16:17:35 +08:00 |
|
Fanzink
|
aae6117db7
|
Merge branch 'develop' into fzq
|
2022-03-16 16:15:16 +08:00 |
|
Fanzink
|
99f92f6891
|
'报表更新'
|
2022-03-16 16:14:50 +08:00 |
|
|
|
d8424e1752
|
Merge pull request '修改bug' (#66) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #66
|
2022-03-16 14:19:58 +08:00 |
|
|
|
598f49e378
|
修改bug
|
2022-03-16 14:19:28 +08:00 |
|
|
|
982c25fa0b
|
Merge pull request '修改bug' (#65) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #65
|
2022-03-16 10:13:21 +08:00 |
|
|
|
2756e75aaf
|
修改bug
|
2022-03-16 10:12:36 +08:00 |
|
|
|
74883db1c0
|
Merge pull request 'fzq' (#64) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #64
|
2022-03-16 09:55:55 +08:00 |
|
|
|
643277e1c7
|
更新 'src/lang/i18n/zh/module/basicData.js'
|
2022-03-16 09:53:24 +08:00 |
|
|
|
4a834c3dc1
|
更新 'src/lang/i18n/en/module/basicData.js'
|
2022-03-16 09:53:04 +08:00 |
|
|
|
6b20524a5f
|
更新 'src/lang/i18n/zh/module/basicData.js'
|
2022-03-16 09:52:02 +08:00 |
|
Fanzink
|
f219b55d0c
|
'更新'
|
2022-03-16 09:43:13 +08:00 |
|
Fanzink
|
79b7fe0eec
|
'更新'
|
2022-03-16 09:41:00 +08:00 |
|
|
|
2329a20c4f
|
Merge pull request 'zwq' (#63) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #63
|
2022-03-16 09:00:59 +08:00 |
|
|
|
7aba931c94
|
提交
|
2022-03-16 08:58:59 +08:00 |
|
|
|
176fd99cd1
|
Merge branch 'test' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into zwq
|
2022-03-16 08:42:53 +08:00 |
|
|
|
77fbbb630b
|
Merge pull request '仓库翻译' (#62) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #62
|
2022-03-15 17:04:29 +08:00 |
|
|
|
18b932afa1
|
仓库翻译
|
2022-03-15 17:04:06 +08:00 |
|
|
|
251d507db7
|
Merge pull request 'gtz' (#61) from gtz into test
Reviewed-on: #61
|
2022-03-15 16:59:59 +08:00 |
|
|
|
8502f5d7d1
|
Merge branch 'develop' into gtz
|
2022-03-15 16:59:11 +08:00 |
|
|
|
9eea286c08
|
i18n dashboard
|
2022-03-15 16:58:48 +08:00 |
|
|
|
d4e0384e10
|
Merge pull request '修改bug' (#60) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #60
|
2022-03-15 14:38:09 +08:00 |
|
|
|
983be7801c
|
修改bug
|
2022-03-15 14:37:40 +08:00 |
|
|
|
d725cb7a0c
|
Merge pull request '修改bug' (#59) from zwq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #59
|
2022-03-15 11:21:10 +08:00 |
|
|
|
ef8a7ef497
|
修改bug
|
2022-03-15 11:20:36 +08:00 |
|
|
|
6ac3fcb572
|
Merge pull request 'fzq' (#58) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #58
|
2022-03-15 10:09:07 +08:00 |
|
Fanzink
|
3e6389f0eb
|
'更新'
|
2022-03-15 09:55:49 +08:00 |
|
Fanzink
|
afde4d5225
|
'更新'
|
2022-03-15 09:12:22 +08:00 |
|
|
|
8da50584fc
|
Merge pull request 'gtz' (#57) from gtz into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #57
|
2022-03-14 17:00:11 +08:00 |
|
|
|
2351e96c9e
|
Merge branch 'develop' into gtz
|
2022-03-14 16:59:06 +08:00 |
|
