Commit Graph

1433 Commits

Author SHA1 Message Date
朱浩 4efc8108e5 Merge branch 'main' into zhuhao_dev 2024-09-25 15:28:02 +08:00
朱浩 9d18bb2cdf PDF插件上线 2024-09-25 15:27:41 +08:00
zhangxuelin a0e0388df8 修改密码验证 2024-09-25 14:30:54 +08:00
lyc 213eacb689 Merge pull request '重新登陆手机号获取' (#269) from lyc-dev into main 2024-09-25 14:28:42 +08:00
lyc 773d0c1957 重新登陆手机号获取 2024-09-25 14:28:38 +08:00
朱浩 7a978ddf55 Merge branch 'main' into zhuhao_dev 2024-09-25 13:47:37 +08:00
qinqing 30bcc7bfc1 Merge pull request 'qinqing_dev' (#268) from qinqing_dev into main
Reviewed-on: #268
2024-09-25 13:47:09 +08:00
qinqing e7a36ddfba Merge branch 'main' into qinqing_dev 2024-09-25 13:46:13 +08:00
qinqing c517fa14af 课标分析,教材分析 2024-09-25 13:45:10 +08:00
朱浩 dcbd288a0a Merge branch 'main' into zhuhao_dev 2024-09-25 11:26:26 +08:00
lyc 38d3e6a906 Merge pull request 'lyc-dev' (#267) from lyc-dev into main 2024-09-25 11:25:30 +08:00
lyc a24da0f6a6 Merge branch 'main' into lyc-dev 2024-09-25 11:24:38 +08:00
lyc bb486e2bd2 教材切换 edit 2024-09-25 11:24:23 +08:00
白了个白 5089ecce3d 作业批改:查询排序更改 2024-09-25 11:22:52 +08:00
朱浩 b884700a62 Merge branch 'main' into zhuhao_dev 2024-09-25 11:10:54 +08:00
朱浩 4816a7c5c8 #817 V2.0.7 教学实践-开始上课逻辑 2024-09-25 11:10:31 +08:00
qinqing 443ecf0ecf Merge branch 'main' into qinqing_dev 2024-09-25 10:11:36 +08:00
baigl 93a5ffef20 Merge pull request 'baigl' (#266) from baigl into main
Reviewed-on: #266
2024-09-25 10:11:03 +08:00
白了个白 d247d22288 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-25 10:10:29 +08:00
白了个白 a3084e0546 1 2024-09-25 10:10:06 +08:00
白了个白 551bd62ae3 1 2024-09-25 10:09:09 +08:00
qinqing b7adda1510 Merge branch 'main' into qinqing_dev 2024-09-25 10:06:57 +08:00
qinqing a3e6aca890 PDF阅读器样式层级更新 2024-09-25 10:05:28 +08:00
zouyf 4e478f487a Merge pull request 'zouyf_dev' (#265) from zouyf_dev into main
Reviewed-on: #265
2024-09-25 09:52:30 +08:00
“zouyf” 2a4b0281c2 Merge branch 'main' into zouyf_dev 2024-09-25 09:51:35 +08:00
“zouyf” b76a589672 增加菁优网样式 2024-09-25 09:51:09 +08:00
lyc 5660d8d167 Merge pull request 'lyc-dev' (#264) from lyc-dev into main 2024-09-25 09:42:53 +08:00
lyc 7845d0e0a1 跳转修改 2024-09-25 09:42:58 +08:00
lyc 40089a2cd0 Merge branch 'main' into lyc-dev 2024-09-24 17:37:03 +08:00
lyc 9329da9ddf 章节切换 edit 2024-09-24 17:36:43 +08:00
qinqing f7262effc3 Merge pull request 'qinqing_dev' (#263) from qinqing_dev into main
Reviewed-on: #263
2024-09-24 17:27:07 +08:00
qinqing 8fd5edf141 Merge branch 'main' into qinqing_dev 2024-09-24 17:25:36 +08:00
qinqing ff441c6579 Merge branch 'qinqing_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into qinqing_dev 2024-09-24 17:23:52 +08:00
qinqing cf331b9c63 课标分析切换教材 2024-09-24 17:23:34 +08:00
“zouyf” b6d9082e1b Merge branch 'main' into zouyf_dev 2024-09-24 16:54:09 +08:00
baigl 918504570f Merge pull request 'baigl' (#261) from baigl into main
Reviewed-on: #261
2024-09-24 16:34:37 +08:00
白了个白 0fc08f647f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-24 16:33:19 +08:00
白了个白 d4a20347db 1 2024-09-24 16:29:28 +08:00
白了个白 2a95f08bb2 作业布置 2024-09-24 16:27:49 +08:00
白了个白 a33ff1abea 作业批改--orderby导致无数据 bug修复 2024-09-24 16:24:31 +08:00
“zouyf” c957961a0b Merge branch 'main' into zouyf_dev 2024-09-24 16:24:22 +08:00
朱浩 09159ae2d8 Merge pull request 'zhuhao_dev' (#260) from zhuhao_dev into main
Reviewed-on: #260
2024-09-24 16:23:23 +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
“zouyf” 26576ad086 Merge branch 'main' into zouyf_dev 2024-09-24 15:54:42 +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