Commit Graph

415 Commits

Author SHA1 Message Date
wyx
7e8c56acc8 fix:修改版本号 2023-03-22 22:05:41 +08:00
wyx
d003b9abe7 fix:评估提交增加二次提示 2023-03-22 22:02:23 +08:00
wyx
add0d8613b fix:项目按钮显示问题 2023-03-22 17:58:51 +08:00
lixg
010899828b feat:修改版本 2023-03-22 16:38:35 +08:00
yuping
57753aac93 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 16:39:01 +08:00
yuping
68cdf80007 --demand 面授课 2023-03-21 16:38:33 +08:00
lixg
ca8714cc40 feat:修改版本号 2023-03-20 09:02:35 +08:00
lixg
c71a618d31 feat:增加签到失败页面 2023-03-17 17:42:23 +08:00
lixg
9783f339eb feat:合并 2023-03-17 15:35:48 +08:00
lixg
1575ffd6fe feat:修改项目详情接口参数 2023-03-17 15:34:55 +08:00
yuping
5a28d73a05 Merge remote-tracking branch 'origin/develop' into develop 2023-03-17 14:57:12 +08:00
yuping
fe88fa1f8c --demand 面授课 2023-03-17 14:56:51 +08:00
lixg
7e573cfd3f feat:修改学习路径type 2023-03-17 14:32:25 +08:00
lixg
b794bf600f feat:增加二维码判断 2023-03-17 14:13:27 +08:00
yuping
2891f14245 --demand 面授课 2023-03-17 12:19:04 +08:00
lixg
f0d1d1b33f feat:合并 2023-03-17 11:53:12 +08:00
yuping
5d5951e42c --demand 面授课 2023-03-17 03:07:08 +08:00
yuping
cc4970af19 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/faceteach/FaceTeach.vue
#	src/views/faceteach/FaceTeachSignUp.vue
2023-03-17 03:06:47 +08:00
yuping
95200739de --demand 面授课 2023-03-17 03:01:22 +08:00
lixg
3c24123b48 feat:修改考试 2023-03-13 09:11:48 +08:00
huangshengfa
01b3dd328c Merge branch 'prev-master' into 'master'
Prev master

See merge request !29
2023-03-10 20:24:06 +08:00
lixg
32549f7d70 feat:修改版本号 2023-03-10 20:15:17 +08:00
lixg
04d6d7838f feat:修改时间 2023-03-10 19:53:41 +08:00
yujicun
e916f559fd Merge remote-tracking branch 'origin/master' 2023-03-10 17:45:41 +08:00
lixg
94b4128458 feat:合并 2023-03-10 17:05:28 +08:00
lixg
90f1fdee9b feat:修改跳转及按钮 2023-03-10 17:03:41 +08:00
lixg
d555d87919 feat:修改时间 2023-03-10 04:12:07 +08:00
yujicun
ce5f01f721 Merge remote-tracking branch 'origin/master' 2023-03-10 01:49:01 +08:00
lixg
cb451dc152 feat:合并 2023-03-10 01:38:59 +08:00
lixg
c43b4fd723 feat:修改bug 2023-03-10 01:37:45 +08:00
huangshengfa
e4e8989f26 Merge branch 'pre-master' into 'master'
Pre master

See merge request !27
2023-03-09 21:38:52 +08:00
lixg
e03440d12e feat:修改作业 2023-03-09 21:22:28 +08:00
lixg
1e20fcc808 feat:合并 2023-03-09 21:09:07 +08:00
lixg
267bf6868a feat:修改配置 2023-03-09 21:07:02 +08:00
lixg
578b68ad53 feat:修改配置 2023-03-09 21:06:36 +08:00
huangshengfa
f8079608a2 Merge branch 'new-master' into 'master'
New master

See merge request !26
2023-03-09 18:55:38 +08:00
BOE\10867418
400ccff1af Merge branch 'pre-master'
# Conflicts:
#	package-lock.json
2023-03-09 18:54:56 +08:00
lixg
c268b5dcb1 feat:修改版本 2023-03-09 17:57:40 +08:00
lixg
fb1fa0576b feat:修改版本 2023-03-09 16:14:52 +08:00
lixg
870f506936 feat:修改版本 2023-03-09 16:09:46 +08:00
lixg
daa85bad28 feat:修改重新报名 2023-03-09 11:56:33 +08:00
lixg
4c99334e3c feat:修改按钮 2023-03-08 22:21:07 +08:00
lixg
feb217e1d1 feat:修改跳转 2023-03-08 18:07:23 +08:00
lixg
70e21510a5 feat:修改跳转 2023-03-08 17:33:34 +08:00
lixg
fae01bb14e feat:合并 2023-03-08 17:10:43 +08:00
lixg
80434eb77f feat:修改版本 2023-03-08 17:09:45 +08:00
lixg
c056252f5a feat:修改版本号 2023-03-08 17:07:16 +08:00
yuping
ed1c928919 init 登录跳转 2023-03-08 14:53:44 +08:00
lixg
e864536e86 feat:修改编码 2023-03-08 14:16:00 +08:00
lixg
d6112b0907 feat:修改版本 2023-03-08 00:06:13 +08:00