1023 Commits

Author SHA1 Message Date
yuping
6f7f310568 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/App.vue
2023-03-09 18:06:07 +08:00
yuping
df1da5242d Merge remote-tracking branch 'origin/manage-release'
# Conflicts:
#	src/App.vue
#	src/views/faceteach/FaceTeachSignUp.vue
2023-03-09 18:04:56 +08:00
wyx
63a102056c fix:合并 2023-03-09 18:04:10 +08:00
yuping
a3bb8f693f Merge remote-tracking branch 'origin/manage-release' into manage-release 2023-03-09 18:03:28 +08:00
yuping
9704649f64 Merge remote-tracking branch 'origin/develop' into manage-release 2023-03-09 18:03:17 +08:00
yuping
4ed7e51e61 fix -- 关卡太多只展示8个 2023-03-09 17:13:29 +08:00
wyx
d4b29effaa fix:修改版本号 2023-03-09 16:12:00 +08:00
wyx
93627b957d fix:修改版本号 2023-03-09 12:19:30 +08:00
wyx
cd349533d4 Merge branch 'develop' into manage-release 2023-03-09 12:19:06 +08:00
wyx
aebc2074b6 fix:限制上传说明文件格式 2023-03-09 12:18:43 +08:00
wyx
b81856762e fix:材料下载 2023-03-09 11:13:30 +08:00
wyx
e22bd7af7f fix:项目闯关模式状态显示问题 2023-03-09 10:49:30 +08:00
wyx
050a9ed4c6 fix:限制jpeg格式上传 2023-03-09 10:10:17 +08:00
wyx
95bb6c8e85 Merge branch 'develop' into manage-release 2023-03-09 00:42:43 +08:00
caozc
3c2527bfef fix: 优化面授课重新报名按钮 2023-03-08 22:18:05 +08:00
wyx
4cb5cbe10f fix:修改版本号 2023-03-08 22:15:24 +08:00
wyx
9ea4edf288 Merge branch 'develop' into manage-release 2023-03-08 22:14:59 +08:00
wyx
d5d6bd961f fix:作业限制视频文件格式上传 2023-03-08 20:30:46 +08:00
wyx
f636221101 fix:修改版本号 2023-03-08 17:23:21 +08:00
wyx
695dc5370d Merge branch 'develop' into manage-release 2023-03-08 17:22:55 +08:00
wyx
30ff5ea1b2 fix:参数判断修改 2023-03-08 14:04:48 +08:00
wyx
f71315807f fix:面授课附件下载问题修改 2023-03-08 11:53:34 +08:00
caozc
e2eefb2563 update : add delCookie 2023-03-08 10:00:55 +08:00
wyx
e9c821e337 Merge branch 'develop' into manage-release 2023-03-08 08:43:03 +08:00
yuping
f5c8478082 Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 03:20:57 +08:00
yuping
f95eef001a fix -- 关卡太多只展示8个 2023-03-08 03:20:48 +08:00
wyx
f3c6a042a6 fix:修改版本号 2023-03-08 01:13:49 +08:00
wyx
be7c8d4781 Merge branch 'develop' into manage-release 2023-03-08 01:13:26 +08:00
wyx
3930ea07b0 fix:修改带图片的投票显示问题 2023-03-07 22:34:40 +08:00
yuping
683636bb65 fix -- bug 2023-03-07 20:29:10 +08:00
yuping
a617bf2194 Merge remote-tracking branch 'origin/develop' into develop 2023-03-07 20:22:30 +08:00
yuping
6193f6a059 fix -- bug 2023-03-07 20:22:07 +08:00
wyx
43042f1b0c fix:默认显示五条 2023-03-07 20:11:54 +08:00
wyx
45b3d2ea97 fix:修改版本号 2023-03-07 17:58:41 +08:00
wyx
696ab89e20 Merge branch 'develop' into manage-release 2023-03-07 17:58:14 +08:00
wyx
b7d9bdb99f feat:增加面授课报名页面报名限制,修改开课时间显示问题 2023-03-07 15:33:13 +08:00
wyx
d01fef96a5 feat:增加面授课报名页面报名限制,修改开课时间显示问题 2023-03-07 15:21:39 +08:00
wyx
2593099125 fix:修改版本号 2023-03-07 01:59:56 +08:00
wyx
1ff952699a Merge branch 'develop' into manage-release 2023-03-07 01:59:25 +08:00
caozc
e3e352841d fix: 报名状态:增强重复报名 2023-03-07 01:25:17 +08:00
caozc
ccb15d6700 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into develop 2023-03-07 01:24:49 +08:00
wyx
f4f45e58b6 fix:项目个人完成度小组完成度修改 2023-03-07 00:55:16 +08:00
wyx
b70e9714aa fix:修改路径图必修进度显示问题 2023-03-06 23:40:17 +08:00
caozc
4b9ab0191d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into develop 2023-03-06 22:58:55 +08:00
wyx
cf345d37da feat:面授课增加重新报名 2023-03-06 22:58:08 +08:00
wyx
724f22d629 fix:外部考试展示字段修改 2023-03-06 17:00:31 +08:00
wyx
4612cd442c Merge branch 'develop' into manage-release 2023-03-06 15:35:45 +08:00
wyx
d161145e53 fix:讨论回复头像修改 2023-03-06 15:35:24 +08:00
wyx
04c45beea5 fix:修改版本号 2023-03-06 14:38:58 +08:00
wyx
1f97f3442f Merge branch 'develop' into manage-release 2023-03-06 14:38:33 +08:00