Commit Graph

302 Commits

Author SHA1 Message Date
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
lixg
6b15242ace feat:增加loading 2023-03-07 23:07:40 +08:00
lixg
c68a2ea1af feat:returnUrl编码 2023-03-07 22:23:54 +08:00
lixg
14c787445a feat:修改富文本图片宽度 2023-03-07 21:45:55 +08:00
lixg
ad63266ef4 feat:修改正则 2023-03-07 21:41:29 +08:00
lixg
beca407c8e feat:修改版本 2023-03-07 17:49:29 +08:00
lixg
1e5dcf0e8a feat:修改 2023-03-07 16:54:33 +08:00
lixg
f0ad8f9ec3 feaT:修改面授课 2023-03-07 16:52:26 +08:00
lixg
de7cf8129b feat:修改作业 2023-03-07 16:50:58 +08:00
lixg
56879640bf feat:修改面授课 2023-03-07 16:46:21 +08:00
lixg
73528efff0 feat:修改 2023-03-07 15:53:44 +08:00
lixg
f1788b2fdf feat:修改面授课报名 2023-03-07 13:42:40 +08:00
lixg
e7959d7514 feat:修改版本 2023-03-06 22:54:08 +08:00
lixg
ffd56dafd0 feat:修改投票 2023-03-06 21:58:13 +08:00