Commit Graph

231 Commits

Author SHA1 Message Date
zwq
396e09f696 修改EAP 2022-08-09 10:07:17 +08:00
0402b24568 Merge pull request '更新ERP' (#96) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #96
2022-07-29 16:33:15 +08:00
zwq
dcbece43f8 更新ERP 2022-07-29 16:32:28 +08:00
4cd26e2f47 Merge pull request '打包' (#95) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #95
2022-07-25 10:22:32 +08:00
zwq
35c3b18b0c 打包 2022-07-25 10:21:32 +08:00
b31e9539fd Merge pull request '更新ERP' (#94) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #94
2022-07-25 10:18:48 +08:00
zwq
72af437415 更新ERP 2022-07-25 10:17:59 +08:00
3e6712ddc5 Merge pull request '修改样式' (#93) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #93
2022-06-29 13:32:36 +08:00
zwq
8d0c0feb72 修改样式 2022-06-29 13:31:49 +08:00
47895cfcf5 Merge pull request '改名字' (#92) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #92
2022-06-21 14:04:14 +08:00
zwq
b907cb88f2 改名字 2022-06-21 14:03:26 +08:00
0fc8003621 Merge pull request '改名字' (#91) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #91
2022-06-21 11:35:38 +08:00
zwq
ecc16ce276 改名字 2022-06-21 11:35:09 +08:00
65a30bae9c Merge pull request 'build: 🏗️ 构建完成后添加钉钉通知' (#90) from ci into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #90
2022-06-08 14:57:47 +08:00
1753aa87a9 build: 🏗️ 构建完成后添加钉钉通知 2022-06-08 14:56:36 +08:00
76ce6184e7 Merge pull request '更新' (#89) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #89
2022-06-07 15:14:16 +08:00
7ff955ead5 Merge branch 'develop' into zwq 2022-06-07 15:14:12 +08:00
zwq
b3ec8dfd4e 更新 2022-06-07 15:13:51 +08:00
74e4aefb86 Merge pull request '名字改回来' (#88) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #88
2022-06-07 15:13:18 +08:00
zwq
42d7714210 名字改回来 2022-06-07 15:11:51 +08:00
f1c60da6b6 Merge pull request '打包' (#87) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #87
2022-06-07 10:44:23 +08:00
zwq
39a1fe7482 打包 2022-06-07 10:43:58 +08:00
5b17f49619 Merge pull request 'build: 🏗️ 调整构建方式,从本地构建后上传dist目录' (#86) from ci into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #86
2022-06-07 10:37:06 +08:00
4929c41361 build: 🏗️ 调整构建方式,从本地构建后上传dist目录 2022-06-07 10:34:36 +08:00
dbb67e6064 Merge pull request '暂时改名字' (#85) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #85
2022-06-06 16:01:57 +08:00
zwq
05fa4c5e21 暂时改名字 2022-06-06 16:01:01 +08:00
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