 朱浩
|
7106d75964
|
Merge pull request '二期：自动同步功能开发' (#54) from zhuhao_dev into main
Reviewed-on: #54
|
2024-07-23 14:07:13 +08:00 |
|
朱浩
|
4c635e9fe3
|
二期：自动同步功能开发
|
2024-07-23 14:06:42 +08:00 |
 lyc
|
4a5fb04362
|
Merge branch 'main' into lyc-dev
|
2024-07-23 13:46:32 +08:00 |
|
lyc
|
d91f08d398
|
布置作业
|
2024-07-23 13:46:09 +08:00 |
|
朱浩
|
5afa31b8c3
|
Merge pull request 'zhuhao_dev' (#53) from zhuhao_dev into main
Reviewed-on: #53
|
2024-07-23 13:45:27 +08:00 |
|
朱浩
|
c8f1047124
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-07-23 13:44:44 +08:00 |
|
朱浩
|
e1fc883870
|
二期：自动同步功能开发
|
2024-07-23 13:43:41 +08:00 |
|
lyc
|
c81b74b9de
|
Merge pull request 'lyc-dev' (#52) from lyc-dev into main
|
2024-07-23 10:23:45 +08:00 |
|
lyc
|
2fbc3e272b
|
Merge branch 'main' into lyc-dev
|
2024-07-23 10:23:34 +08:00 |
|
lyc
|
125962b859
|
备课-增加头部布局
|
2024-07-23 10:23:18 +08:00 |
zdg
|
7782de699f
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
# Conflicts:
# src/main/index.js
|
2024-07-22 16:35:54 +08:00 |
|
zdg
|
df87aafca4
|
悬浮球
|
2024-07-22 16:30:35 +08:00 |
|
lyc
|
5f05ad8bea
|
Merge pull request '打开新网页窗口' (#51) from lyc-dev into main
|
2024-07-22 16:25:13 +08:00 |
|
lyc
|
3dc478e724
|
打开新网页窗口
|
2024-07-22 16:24:32 +08:00 |
|
lyc
|
d72d0ae956
|
Merge pull request '登录窗口/主窗口调整' (#50) from lyc-dev into main
|
2024-07-22 15:11:06 +08:00 |
|
lyc
|
cefb6ae5a7
|
登录窗口/主窗口调整
|
2024-07-22 15:10:28 +08:00 |
|
lyc
|
7b09c8ec81
|
Merge pull request 'window-tools' (#49) from lyc-dev into main
|
2024-07-22 11:25:26 +08:00 |
|
lyc
|
de1e0c5a2e
|
window-tools
|
2024-07-22 11:24:36 +08:00 |
 baigl
|
954f43d8b3
|
vscode 行尾爆红eslintrc 关闭
|
2024-07-19 14:31:54 +08:00 |
|
lyc
|
8ed27fc925
|
Merge pull request '退出 跳转' (#48) from lyc-dev into main
|
2024-07-19 11:10:12 +08:00 |
|
lyc
|
e5e4359b5d
|
退出 跳转
|
2024-07-19 11:09:55 +08:00 |
|
lyc
|
1ce8fd1714
|
Merge pull request '请求地址修改' (#47) from lyc-dev into main
|
2024-07-19 10:31:59 +08:00 |
|
lyc
|
6dbe3c6202
|
请求地址修改
|
2024-07-19 10:31:41 +08:00 |
|
lyc
|
78b30feb13
|
Merge pull request '删除一些无用图片' (#46) from lyc-dev into main
|
2024-07-19 09:37:57 +08:00 |
|
lyc
|
b16f067cee
|
删除一些无用图片
|
2024-07-19 09:33:52 +08:00 |
|
lyc
|
0228bc3084
|
Merge pull request 'lyc-dev' (#44) from lyc-dev into main
|
2024-07-18 17:54:03 +08:00 |
|
lyc
|
be0a34f03e
|
edit
|
2024-07-18 17:53:43 +08:00 |
|
朱浩
|
d5c1d08fa2
|
Merge pull request '基础文件上传核心开发' (#45) from zhuhao_dev into main
Reviewed-on: #45
|
2024-07-18 16:38:14 +08:00 |
|
朱浩
|
21ff546429
|
基础文件上传核心开发
|
2024-07-18 16:37:46 +08:00 |
|
lyc
|
7d80846e0c
|
Merge branch 'main' into lyc-dev
|
2024-07-18 16:33:21 +08:00 |
|
朱浩
|
d262c87b60
|
Merge pull request 'zhuhao_dev' (#43) from zhuhao_dev into main
Reviewed-on: #43
|
2024-07-18 16:32:39 +08:00 |
|
朱浩
|
243561e656
|
Merge branch 'main' into zhuhao_dev
|
2024-07-18 16:28:21 +08:00 |
|
朱浩
|
6f18bf9344
|
基础文件上传核心开发
|
2024-07-18 16:28:00 +08:00 |
|
lyc
|
4b9b5c544f
|
合并冲突
|
2024-07-18 16:23:22 +08:00 |
|
lyc
|
c8389645af
|
删除一些无用文件
|
2024-07-18 16:22:03 +08:00 |
 yangws
|
1e0d0d18e0
|
Merge pull request 'fix: 更改图片的同时更改头像；' (#42) from yangws into main
Reviewed-on: #42
|
2024-07-18 16:01:17 +08:00 |
|
yangws
|
bdc67a6a0e
|
fix: 更改图片的同时更改头像；
|
2024-07-18 16:00:46 +08:00 |
|
yangws
|
4f26bfd7f6
|
Merge pull request 'fix: 修改预览图片的功能；' (#41) from yangws into main
Reviewed-on: #41
|
2024-07-18 15:43:58 +08:00 |
|
yangws
|
acf0018a9c
|
fix: 修改预览图片的功能；
|
2024-07-18 15:41:31 +08:00 |
|
yangws
|
bfe686a164
|
Merge pull request 'fix: 修改预览图片的功能；' (#40) from yangws into main
Reviewed-on: #40
|
2024-07-18 15:36:07 +08:00 |
|
yangws
|
385d6ed25e
|
fix: 修改预览图片的功能；
|
2024-07-18 15:34:52 +08:00 |
|
lyc
|
f77584e849
|
Merge pull request '暂时去掉请求实际限制' (#39) from lyc-dev into main
|
2024-07-18 15:24:49 +08:00 |
|
lyc
|
d702db24c3
|
暂时去掉请求实际限制
|
2024-07-18 15:24:06 +08:00 |
|
朱浩
|
e8d48d8bd9
|
Merge branch 'main' into zhuhao_dev
|
2024-07-18 15:17:45 +08:00 |
|
朱浩
|
a30d2945a0
|
基础文件上传核心开发
|
2024-07-18 15:17:15 +08:00 |
|
lyc
|
75f596ede4
|
Merge pull request '修改一些打包的问题' (#38) from lyc-dev into main
|
2024-07-18 15:14:35 +08:00 |
|
lyc
|
effe6c3272
|
修改一些打包的问题
|
2024-07-18 15:14:11 +08:00 |
|
lyc
|
722f51f3a2
|
Merge pull request 'lyc-dev' (#37) from lyc-dev into main
|
2024-07-18 11:11:26 +08:00 |
|
lyc
|
b9c9269452
|
Merge branch 'main' into lyc-dev
|
2024-07-18 11:11:04 +08:00 |
|
lyc
|
1d069c72a3
|
资源修改
|
2024-07-18 11:10:44 +08:00 |