Commit Graph

1265 Commits

Author SHA1 Message Date
lyc bd82605109 Merge pull request '丑' (#280) from lyc-dev into main 2024-09-27 11:01:00 +08:00
朱浩 e2e8cae690 背景色 2024-09-27 11:00:03 +08:00
lyc 1edef92586 Merge pull request '工作台-edit' (#279) from lyc-dev into main 2024-09-27 10:32:06 +08:00
lyc d330b4cd55 工作台-edit 2024-09-27 10:32:00 +08:00
朱浩 db2218b1c5 Merge pull request 'zhuhao_dev' (#278) from zhuhao_dev into main
Reviewed-on: #278
2024-09-27 10:13:44 +08:00
朱浩 926f45f232 Merge branch 'main' into zhuhao_dev 2024-09-27 10:13:02 +08:00
朱浩 5c0cc9a91c 版本提升 2024-09-27 10:12:49 +08:00
zhengdegang 1152859479 Merge pull request 'zdg' (#277) from zdg into main
Reviewed-on: #277
2024-09-27 09:29:44 +08:00
zdg 68cf2bae1f 屏蔽注释打印 2024-09-27 09:27:51 +08:00
zdg 785b70d888 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-27 09:16:55 +08:00
zdg cae110c686 去掉打印 2024-09-27 09:16:42 +08:00
qinqing 0d5e9755cb Merge pull request 'qinqing_dev' (#276) from qinqing_dev into main
Reviewed-on: #276
2024-09-26 17:26:22 +08:00
qinqing 8eff515fd8 从main分支合并,解决冲突 2024-09-26 17:25:24 +08:00
qinqing cf38097739 优化PDF插件几课标教材分析逻辑优化 2024-09-26 17:18:55 +08:00
lyc 21215150bb Merge branch 'main' into lyc-dev 2024-09-26 16:39:20 +08:00
lyc 773a795707 Merge pull request 'lyc-dev' (#275) from lyc-dev into main 2024-09-26 16:39:19 +08:00
lyc 3b84a340aa 上课里面的章节,教材edit 2024-09-26 16:38:29 +08:00
zouyf b1b4d8e9e1 Merge pull request 'zouyf_dev' (#274) from zouyf_dev into main
Reviewed-on: #274
2024-09-26 16:26:07 +08:00
“zouyf” c3bd7b31ee Merge branch 'main' into zouyf_dev 2024-09-26 16:25:28 +08:00
“zouyf” def2bd32da [作业概况] - 增加点击调用 2024-09-26 16:25:09 +08:00
lyc 2ec9941a20 Merge pull request '教材切换-edit' (#273) from lyc-dev into main 2024-09-26 16:08:56 +08:00
lyc 8a60ce4ef9 教材切换-edit 2024-09-26 16:08:55 +08:00
zouyf 9b33b7d6e6 Merge pull request 'zouyf_dev' (#272) from zouyf_dev into main
Reviewed-on: #272
2024-09-26 14:13:56 +08:00
“zouyf” 8a0b73d07b Merge branch 'main' into zouyf_dev 2024-09-26 14:10:43 +08:00
“zouyf” 4066992aa2 [作业批改] - 优化 2024-09-26 14:10:27 +08:00
zouyf 23b9ab3801 1 2024-09-25 21:04:04 +08:00
“zouyf” a2a263a35a 1 2024-09-25 17:34:31 +08:00
lyc bf7258f005 Merge pull request 'lyc-dev' (#271) from lyc-dev into main 2024-09-25 16:13:59 +08:00
lyc 14e87351c5 Merge branch 'main' into lyc-dev 2024-09-25 16:13:47 +08:00
lyc eb78a80131 工作台-edit 2024-09-25 16:12:55 +08:00
zhangxuelin 40e660f44a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-25 16:09:11 +08:00
朱浩 49f87a4709 Merge pull request 'zhuhao_dev' (#270) from zhuhao_dev into main
Reviewed-on: #270
2024-09-25 15:28:33 +08:00
朱浩 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