 yangws
|
594f380785
|
Merge pull request 'fix:修改添加班级的问题；' (#83) from yangws into main
Reviewed-on: #83
|
2024-07-30 10:17:26 +08:00 |
|
yangws
|
817ea8790e
|
fix:修改添加班级的问题；
|
2024-07-30 10:16:46 +08:00 |
 zhengdegang
|
b317471e66
|
Merge pull request 'zdg' (#82) from zdg into main
Reviewed-on: #82
|
2024-07-30 10:07:28 +08:00 |
zdg
|
f35c6a97b7
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-30 10:05:35 +08:00 |
|
zdg
|
45770d15c1
|
优化生产环境静态文件加载
|
2024-07-30 10:04:49 +08:00 |
|
zdg
|
604a20b9b0
|
生产环境-文件获取
|
2024-07-30 10:00:48 +08:00 |
 lyc
|
d6c302fc04
|
Merge pull request '退出' (#81) from lyc-dev into main
|
2024-07-29 16:06:41 +08:00 |
|
lyc
|
277a5ec873
|
退出
|
2024-07-29 16:05:52 +08:00 |
|
lyc
|
77c1ca7d50
|
Merge pull request 'lyc-dev' (#80) from lyc-dev into main
|
2024-07-29 14:13:12 +08:00 |
|
lyc
|
2565f86260
|
login cookie
|
2024-07-29 14:12:39 +08:00 |
|
zdg
|
b2b95db8fb
|
本地测试
|
2024-07-29 10:18:15 +08:00 |
 zhangxuelin
|
d7ecb2d547
|
1
|
2024-07-29 10:10:39 +08:00 |
|
lyc
|
1f0b02ea61
|
Merge branch 'main' into lyc-dev
|
2024-07-29 09:22:21 +08:00 |
|
lyc
|
71a380f9e0
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-29 09:22:12 +08:00 |
 朱浩
|
f057320625
|
Merge pull request '二期：BUG修复' (#79) from zhuhao_dev into main
Reviewed-on: #79
|
2024-07-27 00:26:44 +08:00 |
|
朱浩
|
2f4d48a8c0
|
二期：BUG修复
|
2024-07-27 00:25:46 +08:00 |
|
zhengdegang
|
529197c9dc
|
Merge pull request 'zdg' (#78) from zdg into main
Reviewed-on: #78
|
2024-07-26 22:16:51 +08:00 |
|
zdg
|
5ac36dd569
|
bug修复
|
2024-07-26 22:15:12 +08:00 |
|
zdg
|
8b7e64765b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 19:20:25 +08:00 |
|
zdg
|
4d17465c24
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 19:20:20 +08:00 |
|
zhangxuelin
|
3097491df2
|
1
|
2024-07-26 17:43:35 +08:00 |
|
朱浩
|
3ad5871505
|
Merge pull request 'zhuhao_dev' (#77) from zhuhao_dev into main
Reviewed-on: #77
|
2024-07-26 17:36:49 +08:00 |
|
朱浩
|
71aff5d1f8
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 17:36:16 +08:00 |
|
朱浩
|
14428f2706
|
二期：BUG修复
|
2024-07-26 17:36:04 +08:00 |
|
lyc
|
e3016b5aff
|
Merge branch 'main' into lyc-dev
|
2024-07-26 17:24:07 +08:00 |
|
lyc
|
1da1db8378
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 17:23:58 +08:00 |
|
zdg
|
dd577385af
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 17:04:14 +08:00 |
|
yangws
|
fb607c6f83
|
Merge pull request 'fix:高度自适应问题；' (#76) from yangws into main
Reviewed-on: #76
|
2024-07-26 16:01:25 +08:00 |
|
yangws
|
52dfb52161
|
fix:高度自适应问题；
|
2024-07-26 16:00:59 +08:00 |
|
lyc
|
ef77069329
|
Merge branch 'main' into lyc-dev
|
2024-07-26 15:43:44 +08:00 |
|
lyc
|
0cfc352c5a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 15:43:38 +08:00 |
|
lyc
|
9fa06cfabb
|
1
|
2024-07-26 15:43:25 +08:00 |
|
朱浩
|
7d4f9bdbf9
|
Merge pull request 'zhuhao_dev' (#75) from zhuhao_dev into main
Reviewed-on: #75
|
2024-07-26 15:39:44 +08:00 |
|
朱浩
|
67bc54765c
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/classManage/index.vue
|
2024-07-26 15:39:00 +08:00 |
|
yangws
|
0d53cabbed
|
Merge pull request 'fix:修改字体颜色；' (#74) from yangws into main
Reviewed-on: #74
|
2024-07-26 15:38:39 +08:00 |
|
yangws
|
e6a08c857a
|
fix:修改字体颜色；
|
2024-07-26 15:38:13 +08:00 |
|
yangws
|
4e6e11ac2c
|
Merge pull request 'fix:修改路由以及用户信息的问题；' (#73) from yangws into main
Reviewed-on: #73
|
2024-07-26 15:36:20 +08:00 |
|
yangws
|
a857912c83
|
fix:修改路由以及用户信息的问题；
|
2024-07-26 15:35:45 +08:00 |
|
zhangxuelin
|
0d2fe7655f
|
设置pdf 比例
|
2024-07-26 15:32:43 +08:00 |
|
朱浩
|
51c8c79b17
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 15:31:17 +08:00 |
|
朱浩
|
53e34dc515
|
二期：BUG修复
|
2024-07-26 15:22:58 +08:00 |
|
lyc
|
18be8cc96a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 14:42:00 +08:00 |
|
lyc
|
f6e5511e94
|
ico
|
2024-07-26 14:41:46 +08:00 |
|
zhangxuelin
|
b3bf366134
|
Merge pull request 'zdg' (#72) from zdg into main
Reviewed-on: #72
|
2024-07-26 14:39:17 +08:00 |
|
zhangxuelin
|
705dbf3832
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/views/resource/index.vue
|
2024-07-26 14:37:32 +08:00 |
|
朱浩
|
03ce0df516
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 14:35:11 +08:00 |
|
yangws
|
ccf16176c6
|
Merge pull request 'fix:修改路由以及用户信息的问题；' (#71) from yangws into main
Reviewed-on: #71
|
2024-07-26 14:34:56 +08:00 |
|
zhangxuelin
|
ca61976291
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 14:34:39 +08:00 |
|
zhangxuelin
|
af6236a751
|
设置pdf宽高
|
2024-07-26 14:34:35 +08:00 |
|
yangws
|
828abbbcb7
|
fix:修改路由以及用户信息的问题；
|
2024-07-26 14:34:16 +08:00 |