Commit Graph

928 Commits

Author SHA1 Message Date
朱浩 4816a7c5c8 #817 V2.0.7 教学实践-开始上课逻辑 2024-09-25 11:10:31 +08:00
朱浩 d3a3acdedc 解决冲突 2024-09-24 16:22:41 +08:00
朱浩 1a678afb89 Merge branch 'main' into zhuhao_dev 2024-09-24 16:21:06 +08:00
朱浩 da20aecfc6 更名文枢课堂 2024-09-24 16:20:20 +08:00
朱浩 d46a86e303 更名文枢课堂 2024-09-24 16:20:06 +08:00
qinqing 32baef766f Merge pull request 'qinqing_dev' (#259) from qinqing_dev into main
Reviewed-on: #259
2024-09-24 15:37:39 +08:00
qinqing 65f959c492 Merge pull request 'main' (#258) from main into qinqing_dev
Reviewed-on: #258
2024-09-24 15:36:42 +08:00
qinqing 4d7b69c8c2 课标分析 2024-09-24 15:35:36 +08:00
yangws 0e832a4a32 Merge pull request 'fix:2.0.4bug修改;' (#250) from yangws into main
Reviewed-on: #250
2024-09-24 13:57:31 +08:00
小杨 c1d6cb7767 fix: 解除注释的部分; 2024-09-24 13:55:37 +08:00
朱浩 53ce42cc59 Merge branch 'main' into zhuhao_dev 2024-09-24 11:03:58 +08:00
朱浩 0d71dee801 更名文枢课堂 2024-09-24 11:03:40 +08:00
yangws 4596ce4911 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 17:30:05 +08:00
zhengdegang 83e985e0d6 Merge pull request 'zdg' (#257) from zdg into main
Reviewed-on: #257
2024-09-23 17:28:43 +08:00
zdg 20ca8f71d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 17:27:42 +08:00
zdg c9292af67b 优化-下课和stroe监听相关bug 2024-09-23 17:26:44 +08:00
lyc fa6f61e3b3 Merge pull request 'lyc-dev' (#256) from lyc-dev into main 2024-09-23 17:24:35 +08:00
lyc bfa7cc4cd9 Merge branch 'main' into lyc-dev 2024-09-23 17:22:56 +08:00
lyc 852b92e1f3 首页跳转 2024-09-23 17:22:43 +08:00
qinqing 56a44740b6 合并代码 2024-09-23 17:12:44 +08:00
qinqing f00fa243c1 调用切换课本 2024-09-23 17:08:35 +08:00
qinqing 82e02f472b 添加课标分析入口 2024-09-23 17:08:02 +08:00
qinqing 3e532c1afd 隐藏工具栏 2024-09-23 17:07:06 +08:00
lyc 47390723a7 Merge pull request '跳转修改' (#255) from lyc-dev into main 2024-09-23 16:50:23 +08:00
lyc 713a592bcf 跳转修改 2024-09-23 16:49:48 +08:00
yangws d1ae68d184 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 16:24:05 +08:00
lyc 3dc36cbc34 Merge pull request '生成图片地址修改' (#254) from lyc-dev into main 2024-09-23 13:01:46 +08:00
lyc 781829373a 生成图片地址修改 2024-09-23 13:01:13 +08:00
朱浩 1be00156a8 去除console 2024-09-23 11:07:59 +08:00
朱浩 dafe13a1a7 Merge branch 'main' into zhuhao_dev 2024-09-23 11:07:47 +08:00
zhengdegang 776e77a88c Merge pull request 'zdg' (#253) from zdg into main
Reviewed-on: #253
2024-09-23 11:06:14 +08:00
zdg 7145658d13 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 11:05:20 +08:00
zdg 372371e2f0 解决下课异常 2024-09-23 11:05:14 +08:00
lyc 2f49d42418 推出 提示正在上课 2024-09-23 10:38:21 +08:00
lyc 8b9cc3f1ee Merge pull request '推出 提示正在上课' (#252) from lyc-dev into main 2024-09-23 10:38:18 +08:00
朱浩 3b4f463883 BUG修复 2024-09-23 10:31:47 +08:00
zdg a05cf19e74 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 10:14:31 +08:00
朱浩 9a5581cea3 Merge branch 'main' into zhuhao_dev 2024-09-23 10:01:45 +08:00
lyc a5ad6c2250 Merge pull request 'edit' (#251) from lyc-dev into main 2024-09-23 09:58:48 +08:00
lyc 60e31f4b43 edit 2024-09-23 09:58:47 +08:00
yangws e36ede941c Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 09:32:35 +08:00
yangws 87a50c397f fix:2.0.4bug修改; 2024-09-23 09:20:19 +08:00
朱浩 6b9949dfae BUG修复 2024-09-22 16:55:00 +08:00
朱浩 56976c6642 Merge branch 'main' into zhuhao_dev 2024-09-22 16:48:16 +08:00
朱浩 27c7033522 Merge pull request 'yangws' (#249) from yangws into main
Reviewed-on: #249
2024-09-22 16:47:12 +08:00
朱浩 4c66cc90c0 BUG修复 2024-09-22 16:46:37 +08:00
lyc c2b54714ac Merge pull request '跳转增加bookid' (#248) from lyc-dev into main 2024-09-22 16:41:45 +08:00
lyc cafea2d719 跳转增加bookid 2024-09-22 16:41:49 +08:00
yangws d5afede36c fix:2.0.4bug修改; 2024-09-22 16:28:10 +08:00
朱浩 dfe28eb037 打包联通文枢课堂 2024-09-22 14:36:25 +08:00