Commit Graph

868 Commits

Author SHA1 Message Date
zhangsir
13543d1f73 Merge branch 'master' into zcwy-master 2024-01-10 17:58:59 +08:00
zhangsir
1128913efb 2022 2024-01-10 17:57:42 +08:00
zhangsir
ed0d7596eb Merge branch 'master' into zcwy-master 2024-01-10 16:50:05 +08:00
zhangsir
aed889bc4b 2024-01-10 16:49:21 +08:00
zhangsir
83323ec464 Merge branch 'master' into zcwy-master 2024-01-10 16:25:11 +08:00
zhangsir
49d2f876c0 修改 2024-01-10 16:24:18 +08:00
zhangsir
6be23aac22 Merge branch 'master' into zcwy-master 2024-01-10 11:08:49 +08:00
zhangsir
8fa0466af7 增加 2024-01-10 10:41:56 +08:00
joshen
7b4e9cb5f8 Merge branch 'zcwyTeacher' into 'master'
Zcwy teacher

See merge request !89
2023-11-21 16:11:14 +08:00
nisen
ac94879005 结束函数更换 2023-11-21 13:20:15 +08:00
nisen
18092b9a0b 播放视频时,解决视频加载一直计时问题 2023-11-21 10:17:01 +08:00
joshen
f12eaad639 Merge branch 'zcwyTeacher' into 'master'
Zcwy teacher

See merge request !83
2023-11-10 17:19:51 +08:00
nisen
a6d2a6c898 还原拉取进度条的时间 2023-11-07 15:17:31 +08:00
nisen
c34546ae3f 修改视频时长的拖拽计时问题 2023-11-03 14:56:19 +08:00
NiSen
d64439e9f7 案例添加课程分类 2023-10-16 17:07:07 +08:00
NiSen
33bd6a8315 案例三级添加 2023-10-13 13:26:45 +08:00
joshen@zcwytd.com
2cf4f56906 Merge branch 'cloud' into xingao0922 2023-10-11 10:49:13 +08:00
daihh
6aa239fdef 修改课程管理中学习人员的分页查询的bug 2023-10-11 09:44:17 +08:00
joshen@zcwytd.com
ee31460eb3 Merge branch 'cloud' into xingao0922 2023-09-22 11:46:07 +08:00
nisen
95c0101b50 打开教师专区 2023-09-08 13:34:25 +08:00
nisen
aa9720c3b8 修改跳转路径 2023-09-07 10:55:46 +08:00
nisen
7c614bed6b 隐藏入口 2023-09-06 17:51:48 +08:00
nisen
f326a2548b 修改问题 2023-09-05 16:44:16 +08:00
nisen
d88e9dd3bb 输出 2023-09-05 15:50:17 +08:00
nisen
ce06d6204a 修改 2023-09-04 18:11:20 +08:00
nisen
fbf2b7e4b8 修改 2023-09-04 15:25:51 +08:00
daihh
a3cfca0ecc 修改一个bug问题,学习记录,根据姓名查询的,查出不数据的问题 2023-09-04 10:03:15 +08:00
nisen
622bcf9d14 教师节 2023-08-28 10:15:37 +08:00
nisen
4b2816e183 课程和案例本地存储 2023-08-14 12:27:10 +08:00
lims1@hunktimes.com
c7ecb9327a Merge remote-tracking branch 'origin/dev0731' into dev0731 2023-08-09 01:44:08 +08:00
lims1@hunktimes.com
8395cb26fa 小课堂弹框 2023-08-09 01:43:47 +08:00
yujicun
68c710f275 Merge remote-tracking branch 'origin/cloud' into dev0731 2023-08-07 09:58:40 +08:00
daihh
90fcc077e7 受众接口返回值变化修改 2023-08-05 19:46:59 +08:00
joshen@zcwytd.com
a6c754ce43 问答报错 2023-08-03 19:14:51 +08:00
joshen@zcwytd.com
883c613823 header问题 2023-08-03 11:14:20 +08:00
joshen@zcwytd.com
8b6f366c6a 管理员跳转 2023-08-02 17:09:11 +08:00
nisen
cf5a7ee4f8 合并分支 2023-08-01 17:37:08 +08:00
yujicun
adc5ed7afb Merge remote-tracking branch 'origin/cloud' into dev0731 2023-07-31 17:08:33 +08:00
daihh
f335e4d19e 提交 2023-07-28 15:37:57 +08:00
daihh
8a66e18bf0 提交 2023-07-28 15:29:54 +08:00
daihh
2c308d7c15 修改管理连接问题 2023-07-28 15:17:02 +08:00
daihh
35c2772932 提交修改连接 2023-07-28 15:14:55 +08:00
daihh
7bbfc85833 跳转问题 2023-07-28 14:54:07 +08:00
daihh
231fe35ce5 修改管理端跳转地址
管理端接口调用,401,不再跳转登录,不过打印错误信息
2023-07-28 10:58:22 +08:00
daihh
cee14b372e 退出修改 2023-07-06 14:49:21 +08:00
daihh
8cf834b11c 修改退出接口调用 2023-07-05 19:19:23 +08:00
BOE\10867418
984fa813af Merge branch 'dai-master' 2023-06-08 16:29:23 +08:00
daihh
9164f7aa45 修改上传文字提示 2023-06-08 13:40:09 +08:00
BOE\10867418
d42c00c2fd Merge branch 'dai-master' 2023-04-11 09:46:13 +08:00
daihh
7b72e42798 上传http与https的处理,优化Aajx的超时时间 2023-03-28 16:10:15 +08:00