a_bazu
/
cloud-web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94 Commits
4 Branches
0 Tags
3.4 MiB
Commit Graph

94 Commits (141326406867a871dfbc20eb325f4536ade0c76b)

Author SHA1 Message Date
Aaaaaaaa 1413264068 Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-web into dev 
# Conflicts:
#	src/views/market/apitest/index.vue
 2024-09-08 18:59:13 +08:00
WeiRan 1009cd7583 企业管理完善新增 2024-09-08 18:57:58 +08:00
Aaaaaaaa 48d5b57397 Merge branch 'master' into dev 
# Conflicts:
#	src/api/market/orders.js
#	src/views/market/apitest/index.vue
 2024-09-08 18:54:47 +08:00
Aaaaaaaa 3189457a62 业务 2024-09-08 16:59:54 +08:00
Aaaaaaaa 7d8e8e6eec Merge branch 'dev' of https://gitea.qinmian.online/a_bazu/cloud-web into dev 
# Conflicts:
#	src/api/market/orders.js
#	src/api/market/product.js
#	src/views/market/apitest/index.vue
 2024-09-08 16:58:56 +08:00
WeiRan fdc771ab6d 企业管理完善新增 2024-09-08 16:49:18 +08:00
WeiRan 29fcb4346e Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-web 2024-09-08 16:47:17 +08:00
WeiRan 1a78d90997 企业管理完善新增 2024-09-08 16:46:54 +08:00
Aaaaaaaa 0235151eee Merge branch 'dev' 
# Conflicts:
#	src/api/market/orders.js
#	src/api/market/product.js
#	src/views/market/apitest/index.vue
 2024-09-08 15:36:29 +08:00
Aaaaaaaa 105ef2f6ae 改线上 2024-09-08 15:23:21 +08:00
WeiRan 4d5c34e8fa 企业管理完善新增 2024-09-07 12:12:11 +08:00
WeiRan cb4439e48a 合并了远程master分支，解决了apitest和工作台的冲突 2024-09-07 10:17:36 +08:00
Aaaaaaaa b2ebdf1c46 改线上 2024-09-06 17:33:47 +08:00
Aaaaaaaa 8686aadd8d 改线上 2024-09-06 17:29:52 +08:00
Aaaaaaaa f4443a7b7e ok 2024-09-06 17:19:25 +08:00
Aaaaaaaa ea1c143e80 ok 2024-09-06 16:35:22 +08:00
Aaaaaaaa 67d4b34f21 ok 2024-09-06 09:57:02 +08:00
Aaaaaaaa 6c66bd1374 ok 2024-09-06 09:05:56 +08:00
Yueng 5f182ea1fc 添加资产授权 2024-09-06 00:38:23 +08:00
Aaaaaaaa 53ea1aa2e0 ok 2024-09-05 21:03:28 +08:00
Aaaaaaaa 5540e3e214 Merge branch 'dev' 
# Conflicts:
#	src/views/market/apitest/index.vue
 2024-09-05 11:29:43 +08:00
Aaaaaaaa b1788762a7 ok 2024-09-05 11:28:55 +08:00
WeiRan 5d30b3b22e 企业管理完善新增 2024-09-05 10:40:34 +08:00
Aaaaaaaa 9729d67fda ok 2024-09-05 09:15:14 +08:00
Yueng 91cfb0171a 添加资产授权 2024-09-04 22:10:18 +08:00
Aaaaaaaa 1656f3b71d Merge branch 'dev' 
# Conflicts:
#	src/views/market/apitest/index.vue
 2024-09-04 20:06:56 +08:00
Aaaaaaaa 99f54f306a ok 2024-09-04 20:05:17 +08:00
WeiRan 2cbfcd45f2 企业管理完善新增 2024-09-04 19:06:50 +08:00
Yueng 143527169a 添加资产授权 2024-09-04 11:25:37 +08:00
WeiRan 0ba53a33eb 企业管理完善新增 2024-09-04 09:14:27 +08:00
Aaaaaaaa f1fb67cf1f ok 2024-09-04 08:54:52 +08:00
WeiRan d0a13cc604 初步编写测试次数限制 2024-09-03 09:40:49 +08:00
Aaaaaaaa b5b9ce86bc Merge branch 'dev' 2024-09-02 20:31:09 +08:00
Aaaaaaaa e01ab412bc ok 2024-09-02 20:30:34 +08:00
Yueng 7c8e69e1f6 添加资产展示 2024-09-02 20:12:43 +08:00
WeiRan c20e4d1667 企业管理完善新增 2024-09-02 09:43:54 +08:00
Yueng fd40a1edf7 添加资产展示 2024-09-01 19:16:09 +08:00
Yueng 8ae1b76ddc 添加资产展示 2024-09-01 18:57:28 +08:00
WeiRan f427e262ce 后台接口及企业管理完善 2024-09-01 15:35:58 +08:00
WeiRan 9a87b64c6b 后台接口及企业管理完善 2024-09-01 10:24:05 +08:00
Yueng 90fd958bbe Merge pull request '更新流程' (#3) from dev into master 
Reviewed-on: #3
 2024-08-31 02:04:17 +08:00
WeiRan 3023ef2b5e 后台接口管理完善 2024-08-31 00:54:18 +08:00
niuwu666 dbafb70daf Merge pull request '纠正远调报错' (#6) from dev into master 
Reviewed-on: #6
 2024-08-30 09:45:36 +08:00
张腾 0329f43d43 纠正远调报错 2024-08-30 09:45:04 +08:00
WeiRan ecead0f5bf 新增三个接口调用 2024-08-30 09:28:45 +08:00
niuwu666 0df439daaa Merge pull request 'dev' (#5) from dev into master 
Reviewed-on: #5
 2024-08-30 00:46:30 +08:00
张腾 b3922ab76c 更新流程 2024-08-30 00:46:04 +08:00
张腾 fc02d33044 Merge remote-tracking branch 'origin/dev' into dev 2024-08-29 20:43:34 +08:00
Aaaaaaaa beb15b8118 ok 2024-08-29 20:43:13 +08:00
Aaaaaaaa 246505dc5e Merge branch 'dev' 2024-08-29 19:45:29 +08:00