Commit Graph

27 Commits

Author SHA1 Message Date
zhangxuelin dd8c48f3ae 学校加入 注册 登录注册 加入学校审批 2024-11-06 16:55:40 +08:00
zhangxuelin bbf85c4337 注册 2024-10-30 17:25:04 +08:00
zhangxuelin 9167751c6c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/layout/components/Aside.vue
2024-10-30 15:08:25 +08:00
zhangxuelin 7319c396c4 新增加入学校 学校认证 2024-10-30 15:06:37 +08:00
lyc 32ab4dbbfb Merge pull request '更新图标' (#10) from lyc-dev into main 2024-10-30 10:54:01 +08:00
lyc 9d742a1e21 更新图标 2024-10-30 10:54:44 +08:00
yangws ed45284e20 Merge pull request 'fix:个人中心修改;' (#9) from yangws_ws into main
Reviewed-on: #9
2024-10-30 10:52:10 +08:00
小杨 7a18c1927a fix:个人中心修改; 2024-10-30 10:50:30 +08:00
lyc 923d0f1f9a init 2.5 2024-10-30 10:39:00 +08:00
lyc bc8b80e7d7 Merge pull request 'init 2.5' (#8) from lyc-dev into main 2024-10-30 10:38:17 +08:00
zhangxuelin b7dc080840 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-10-30 10:24:16 +08:00
zhangxuelin 41d6b35340 登录 2024-10-30 10:23:38 +08:00
lyc 01f32869ba Merge pull request '2.5init' (#7) from lyc-dev into main 2024-10-30 09:59:45 +08:00
lyc 61be71674c 2.5init 2024-10-30 10:00:23 +08:00
yangws 52521e1e97 Merge pull request 'add:个人中心UI还原;' (#6) from yangws_ws into main
Reviewed-on: #6
2024-10-29 17:31:21 +08:00
小杨 a8dbd41bdb add:个人中心UI还原; 2024-10-29 17:30:48 +08:00
lyc 208c3b00dd 2.5init 2024-10-29 17:25:27 +08:00
lyc 5ce054cced Merge pull request '2.5init' (#5) from lyc-dev into main 2024-10-29 17:24:53 +08:00
lyc 74a65479c7 2.5init 2024-10-29 15:11:06 +08:00
lyc c2fab0f45c Merge pull request '2.5init' (#4) from lyc-dev into main 2024-10-29 15:10:26 +08:00
lyc c3c94132bf Merge pull request '2.5init' (#3) from lyc-dev into main 2024-10-29 15:05:24 +08:00
lyc 4e6d619762 2.5init 2024-10-29 15:06:02 +08:00
lyc 48938c29a3 2.5init 2024-10-29 14:34:33 +08:00
lyc 1decd5505a Merge pull request '2.5init' (#2) from lyc-dev into main 2024-10-29 14:34:23 +08:00
lyc 1e9b92d53a 2.5init 2024-10-29 14:26:09 +08:00
lyc 6b16d462fd Merge pull request '2.5init' (#1) from lyc-dev into main 2024-10-29 14:25:50 +08:00
朱浩 1d9976f9ec 文枢AI2.5初始化 2024-10-25 14:38:32 +08:00