Commit Graph

1116 Commits

Author SHA1 Message Date
zouyf 4b71008bee Merge pull request 'zouyf_dev' (#178) from zouyf_dev into main
Reviewed-on: #178
2024-09-09 16:47:27 +08:00
“zouyf” aab477999e Merge branch 'main' into zouyf_dev 2024-09-09 16:44:40 +08:00
“zouyf” d1b7101ba5 [考试分析] - 优化显示解析 2024-09-09 16:44:24 +08:00
白了个白 7cb84ffe37 作业批阅:附件预览 2024-09-09 15:50:55 +08:00
lyc 47f3202444 Merge pull request 'lyc-dev' (#177) from lyc-dev into main 2024-09-09 09:51:28 +08:00
lyc 3cd8c51aae Merge branch 'main' into lyc-dev 2024-09-09 09:51:06 +08:00
lyc be187e1a2d header路由报错 2024-09-09 09:48:28 +08:00
白了个白 0c506a09f2 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-09 09:28:57 +08:00
白了个白 04ac5dc8b5 作业批阅 2024-09-09 07:04:21 +08:00
zhangxuelin aca464fddd Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-09 01:15:19 +08:00
zhangxuelin 25d026bd13 新增注册页面 2024-09-09 01:14:26 +08:00
lyc 119e07bcea 新增工作台 2024-09-07 18:18:56 +08:00
“zouyf” 555960b8bd Merge branch 'main' into zouyf_dev 2024-09-07 18:08:15 +08:00
“zouyf” d709753534 [考试分析] - 添加 2024-09-07 18:07:32 +08:00
朱浩 78ac6e5ca6 解决版本问题 2024-09-06 15:38:50 +08:00
朱浩 acc29b02e4 解决版本问题 2024-09-06 15:33:25 +08:00
zhengdegang 12da4ac2c0 Merge pull request 'zdg' (#176) from zdg into main
Reviewed-on: #176
2024-09-05 16:32:57 +08:00
zdg 5ecba3fb62 默认群没清除,导致没有创建群 2024-09-05 16:28:15 +08:00
zdg f5f33eaa63 im日志级别 Debbug 2024-09-05 16:18:34 +08:00
zhengdegang 090bc5997c Merge pull request 'zdg' (#175) from zdg into main
Reviewed-on: #175
2024-09-05 01:31:11 +08:00
zdg 1c69d10263 修复-- bug 工具在桌面和pdf切换 2024-09-05 01:30:24 +08:00
zdg b794d55cd7 注释掉 2024-09-05 01:05:29 +08:00
zdg 28b5a131fd Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-05 01:03:25 +08:00
zdg e740cb0c7e Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-05 01:02:47 +08:00
zdg 3a83a31970 修复数据状态-生产环境 无法监听问题 2024-09-05 01:02:42 +08:00
zhangxuelin 30f7b9d5b3 Merge pull request '修复bug-画笔' (#174) from zdg into main
Reviewed-on: #174
2024-09-04 21:12:24 +08:00
zhangxuelin 37810586b7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-04 21:09:45 +08:00
zhangxuelin e31858a3fe 修改pdf画笔bug 2024-09-04 21:06:21 +08:00
zdg 3a6b78bc76 修复bug-画笔 2024-09-04 20:43:47 +08:00
zhengdegang 10a1342b95 Merge pull request '修复 bug' (#173) from zdg into main
Reviewed-on: #173
2024-09-04 19:51:06 +08:00
zdg 70e99e69ba 修复 bug 2024-09-04 19:50:23 +08:00
lyc 3171c0b3f9 Merge pull request 'lyc-dev' (#172) from lyc-dev into main 2024-09-04 16:29:09 +08:00
lyc 33e84ca006 资源推送 2024-09-04 16:28:36 +08:00
lyc 28a815169d Merge branch 'main' into lyc-dev 2024-09-04 13:46:36 +08:00
zhengdegang eace8b56d8 Merge pull request 'zdg' (#171) from zdg into main
Reviewed-on: #171
2024-09-03 18:11:46 +08:00
zdg e03e385dbc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-03 18:03:30 +08:00
zdg 2aaa15230a 恢复 im 注释 2024-09-03 18:03:25 +08:00
zdg 7894214859 修复bug: #678 #652 #648 2024-09-03 18:02:46 +08:00
朱浩 fe41a63b2d Merge pull request 'zhuhao_dev' (#170) from zhuhao_dev into main
Reviewed-on: #170
2024-09-03 16:39:57 +08:00
朱浩 cdf12cf213 区分生产和测试版本,测试版会直接显示测试版文字 2024-09-03 16:37:39 +08:00
yangws 7bb8d2afeb Merge pull request 'fix:看不了学生信息;' (#169) from yangws into main
Reviewed-on: #169
2024-09-03 16:33:03 +08:00
yangws cfac2086e6 fix:看不了学生信息; 2024-09-03 16:31:40 +08:00
朱浩 59ca00d6d1 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	package.json
2024-09-03 16:15:07 +08:00
zdg b6504e114f 桌面,底部导航 多个窗口 2024-09-03 16:01:40 +08:00
lyc 931ed531ab Merge branch 'main' into lyc-dev 2024-09-03 14:12:00 +08:00
zhengdegang 5433e47d0b Merge pull request '修复bug-数据共享' (#168) from zdg into main
Reviewed-on: #168
2024-09-03 13:19:35 +08:00
zdg eb3778dde2 修复bug-数据共享 2024-09-03 13:18:40 +08:00
lyc a6bda302af Merge branch 'main' into lyc-dev 2024-09-03 10:41:57 +08:00
zhengdegang 411ef757e2 Merge pull request 'zdg' (#167) from zdg into main
Reviewed-on: #167
2024-09-02 22:23:07 +08:00
zdg 0201385e75 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-02 22:22:14 +08:00