Commit Graph

3014 Commits

Author SHA1 Message Date
joshen
72a849fa61 Merge branch 'master-20250428-shl' into test20250220 2025-04-29 11:50:03 +08:00
sunhonglai
a9de4ad77c 修改教师端我的授课记录查询和导出 2025-04-29 11:49:39 +08:00
joshen
b8bb81ef75 Merge branch 'master-20250428-shl' into test20250220 2025-04-29 11:46:58 +08:00
sunhonglai
a3c85cbd19 修改教师端我的授课记录查询和导出 2025-04-29 11:46:40 +08:00
joshen
6a49a96517 Merge branch 'master-20250428-shl' into test20250220 2025-04-29 11:40:56 +08:00
sunhonglai
9a6727e52f 修改教师端我的授课记录查询和导出 2025-04-29 11:40:29 +08:00
joshen
5cb021e1c4 Merge branch 'master-20250428-shl' into test20250220 2025-04-29 11:34:14 +08:00
sunhonglai
7cee4b5ad1 修改教师端我的授课记录查询和导出 2025-04-29 11:33:51 +08:00
joshen
1499c7633d Merge branch 'master-20250428-shl' into test20250220 2025-04-29 11:25:36 +08:00
sunhonglai
c3b5f1baf0 修改教师端我的授课记录查询和导出 2025-04-29 11:23:45 +08:00
joshen
87fe2c3f1b 临时测试 2025-04-23 15:49:58 +08:00
joshen
7c159ac091 Merge branch '250422-bugfix-shl' into test20250220 2025-04-23 14:21:31 +08:00
sunhonglai
213990a7b0 每次加载pdf前,清空路径 2025-04-23 14:16:21 +08:00
joshen
9d46a207d9 打日志 2025-04-21 15:22:19 +08:00
joshen
28438f9ec0 优化 2025-04-21 15:08:00 +08:00
joshen
236e9521be Merge branch '250415-bugfix-shl' into test20250220 2025-04-21 14:45:11 +08:00
sunhonglai
505e3ce00c 修改进度条文案 2025-04-21 14:37:53 +08:00
joshen
bc7f7e12c9 Merge branch '250415-bugfix-shl' into test20250220 2025-04-21 11:20:31 +08:00
sunhonglai
ff908554fd 修改上报时长接口 2025-04-21 11:10:21 +08:00
joshen
6b74e61684 Merge branch '250415-bugfix-shl' into test20250220 2025-04-18 09:56:06 +08:00
sunhonglai
e031dcd935 修改上报时长接口 2025-04-18 09:42:06 +08:00
sunhonglai
2139e15813 修改上报时长接口 2025-04-18 09:41:46 +08:00
joshen
a344c9f6bd Merge branch '250415-bugfix-shl' into test20250220 2025-04-18 09:28:11 +08:00
sunhonglai
8497deea52 增加日志打印 2025-04-18 09:27:01 +08:00
joshen
39063bb37e Merge branch '250415-bugfix-shl' into test20250220 2025-04-18 08:59:45 +08:00
sunhonglai
8746904cb9 学习时长上报接口合并 2025-04-18 08:51:48 +08:00
joshen
5d458c97da Merge branch '250415-bugfix-shl' into test20250220
# Conflicts:
#	src/views/study/coursenew.vue
2025-04-16 14:07:54 +08:00
sunhonglai
213e5abce3 去掉无用注释影响后绪修改逻辑 2025-04-16 14:01:43 +08:00
sunhonglai
dc7f942303 先修改对应的后端接口 2025-04-16 10:19:56 +08:00
sunhonglai
4c1c370879 清除无用注释,影响排查要搜索修改的代码 2025-04-16 08:51:10 +08:00
joshen
30224553c9 Merge branch '250415-bugfix-shl' into test20250220 2025-04-15 16:26:08 +08:00
sunhonglai
ffbc4ef808 增加乐享强制走sso 2025-04-15 16:20:23 +08:00
joshen
34ab4e5319 Merge branch '250415-bugfix-shl' into test20250220 2025-04-15 09:14:19 +08:00
sunhonglai
5936183912 增加乐享转向 2025-04-15 09:12:11 +08:00
joshen
4df875d891 部署生产1 2025-04-14 14:45:50 +08:00
joshen
205fcac1f4 部署生产1 2025-04-14 14:42:51 +08:00
joshen
084fcec0c4 部署生产1 2025-04-14 14:37:29 +08:00
joshen
3ff5b9989c Merge branch 'master-20250403-lyc' into test20250220 2025-04-09 14:31:45 +08:00
sunhonglai
702881c100 修改排行榜展示数据不对问题 2025-04-09 14:28:42 +08:00
joshen
edd45a8e78 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:37:13 +08:00
670788339
b0229f6cde 测试 2025-04-03 16:36:38 +08:00
joshen
5b33403db2 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:34:16 +08:00
670788339
9c6c1708fc 测试 2025-04-03 16:33:42 +08:00
joshen
93fb9157e1 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:25:18 +08:00
670788339
b67d7f4311 测试 2025-04-03 16:24:13 +08:00
joshen
aff28e9ec7 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:18:13 +08:00
670788339
c5e54f0170 测试 2025-04-03 16:17:04 +08:00
joshen
5eebcf58c5 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 15:30:38 +08:00
joshen
e45f701138 Merge remote-tracking branch '121-git/test20250220' into test20250220 2025-04-03 15:24:04 +08:00
joshen
fab62c4f7f Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 15:23:44 +08:00