Commit Graph

205 Commits

Author SHA1 Message Date
8a18d705a4 Merge pull request '暂时改名字' (#84) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #84
2022-06-06 13:57:53 +08:00
zwq
a64de34ef1 暂时改名字 2022-06-06 13:57:21 +08:00
0bcc5baf7a Merge pull request 'fzq' (#83) from fzq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #83
2022-05-30 13:45:03 +08:00
Fanzink
c595794b1a Merge branch 'develop' into fzq 2022-05-30 13:42:36 +08:00
Fanzink
72ac5b9998 '修改导出后空白bug' 2022-05-30 13:41:50 +08:00
ddc3f5d49d Merge pull request '修改首页详情' (#82) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #82
2022-04-02 16:04:35 +08:00
zwq
db0a906323 修改首页详情 2022-04-02 16:04:07 +08:00
93a412d243 Merge pull request '修改bug' (#81) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #81
2022-03-28 13:56:31 +08:00
zwq
aa85593884 修改bug 2022-03-28 13:56:03 +08:00
a77918c059 Merge pull request 'fzq' (#80) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #80
2022-03-28 13:54:27 +08:00
Fanzink
d8336aced0 '修改存储箱字段' 2022-03-28 11:13:51 +08:00
Fanzink
43983bc929 '修改存储箱字段' 2022-03-28 11:12:03 +08:00
6d3309ed2b Merge pull request '修改bug' (#79) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #79
2022-03-22 11:27:14 +08:00
zwq
cae8938e22 修改bug 2022-03-22 11:26:34 +08:00
03b13c77aa Merge pull request 'fzq' (#78) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #78
2022-03-21 09:12:51 +08:00
Fanzink
985ec95bc6 Merge branch 'develop' into fzq 2022-03-20 09:50:51 +08:00
Fanzink
453f66b7b3 '更新字段' 2022-03-20 09:50:14 +08:00
47793c38da Merge pull request '修改bug' (#77) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #77
2022-03-19 13:52:17 +08:00
zwq
dcb7801d24 修改bug 2022-03-19 13:49:04 +08:00
f59fc1a594 Merge pull request 'gtz' (#76) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #76
2022-03-18 16:37:14 +08:00
b2c50e8c56 merge 2022-03-18 16:36:37 +08:00
dd8e54f743 首页去除缓存 2022-03-18 16:29:54 +08:00
8142f16662 dashboard attribute number to string 2022-03-18 16:05:01 +08:00
5ec45b87ca Merge pull request 'fzq' (#75) from fzq into develop
All checks were successful
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
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #74
2022-03-18 09:50:40 +08:00
zwq
018695fe70 修改bug 2022-03-18 09:49:30 +08:00
9aaffbb8b4 Merge pull request '修改bug' (#73) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #73
2022-03-17 16:22:39 +08:00
zwq
2a2bd1d726 修改bug 2022-03-17 16:21:35 +08:00
dd029f2055 Merge pull request 'eqtyep default' (#72) from gtz into develop
All checks were successful
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
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #71
2022-03-17 10:59:56 +08:00
zwq
995db83484 修改仓库样式 2022-03-17 10:59:00 +08:00
40f426f7f5 Merge pull request 'base eq add' (#70) from gtz into develop
All checks were successful
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
Some checks failed
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
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #68
2022-03-16 16:19:42 +08:00
zwq
dfb1f3d97b 修改bug 2022-03-16 16:18:59 +08:00
26772a324a Merge pull request 'fzq' (#67) from fzq into develop
All checks were successful
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
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #66
2022-03-16 14:19:58 +08:00
zwq
598f49e378 修改bug 2022-03-16 14:19:28 +08:00
982c25fa0b Merge pull request '修改bug' (#65) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #65
2022-03-16 10:13:21 +08:00
zwq
2756e75aaf 修改bug 2022-03-16 10:12:36 +08:00