Commit Graph

972 Commits

Author SHA1 Message Date
lyc c64e946aee edit 2024-07-10 09:56:26 +08:00
lyc 606307dd66 Merge pull request 'edit' (#6) from lyc-dev into main 2024-07-10 09:44:00 +08:00
lyc 50c2deb051 edit 2024-07-10 09:42:49 +08:00
朱浩 c544343eec Merge pull request 'zhuhao_dev' (#5) from zhuhao_dev into main
Reviewed-on: #5
2024-07-09 17:50:17 +08:00
朱浩 dbcb17fc7e Merge branch 'main' into zhuhao_dev 2024-07-09 17:49:49 +08:00
lyc 4357e72809 Merge pull request 'lyc-dev' (#4) from lyc-dev into main 2024-07-09 17:49:33 +08:00
lyc bd263fc598 Merge branch 'main' into lyc-dev 2024-07-09 17:48:51 +08:00
lyc 77a6a4855f edit 2024-07-09 17:48:20 +08:00
朱浩 a747252e03 Merge branch 'main' into zhuhao_dev 2024-07-09 17:48:17 +08:00
朱浩 300e9130aa 解决框架标黄,头部退出添加,头像添加 2024-07-09 17:47:58 +08:00
朱浩 f5d94a710c 解决无法缩小问题,解决跳转登录失败问题 2024-07-09 16:45:40 +08:00
朱浩 985ce69d9d Merge pull request '基础上传功能实现' (#3) from zhuhao_dev into main
Reviewed-on: #3
2024-07-09 16:20:10 +08:00
朱浩 07f982c0b3 基础上传功能实现 2024-07-09 16:19:33 +08:00
朱浩 0f8d61fce7 Merge pull request 'zhuhao_dev' (#2) from zhuhao_dev into main
Reviewed-on: #2
2024-07-09 15:00:05 +08:00
朱浩 4f32e6f1b2 基础修改 2024-07-09 14:59:34 +08:00
朱浩 790aa54601 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/layout/index.vue
#	src/renderer/src/router/index.js
2024-07-09 14:53:15 +08:00
lyc 72222261b5 Merge pull request 'edit' (#1) from lyc-dev into main 2024-07-09 14:51:01 +08:00
lyc 053bdd321e edit 2024-07-09 14:50:36 +08:00
朱浩 13f4adcf6b 基础修改 2024-07-09 14:50:30 +08:00
朱浩 90afc0d8a3 修改排除文件 2024-07-08 17:16:34 +08:00
朱浩 4faff94195 删除 .vscode/extensions.json 2024-07-08 16:26:28 +08:00
lyc 355cc0532a init 2024-07-08 16:24:56 +08:00