Commit Graph

961 Commits

Author SHA1 Message Date
zhangsir
a7c235923b 修改积分排行榜的显示隐藏 2024-01-30 09:30:22 +08:00
zhangsir
e27cb2dbed Merge branch 'master' into dev0731 2024-01-29 17:38:43 +08:00
zhangsir
96829ddb72 Merge remote-tracking branch 'boe/zcwy-dev' into zcwy-dev 2024-01-29 17:38:19 +08:00
zhangsir
c2f6b8d0ee Merge branch 'master' into zcwy-dev
# Conflicts:
#	src/views/project/ProjectDetails.vue
2024-01-29 17:36:14 +08:00
zhangsir
da879dee65 积分排行榜的显示隐藏 2024-01-29 17:32:51 +08:00
joshen
84d2b7bb54 Merge branch 'zcwy-dev' into 'master'
Zcwy dev

See merge request !40
2023-12-28 14:25:02 +08:00
joshen@zcwytd.com
19aad9c96f Merge branch 'zcwy_master' into zcwy-dev
# Conflicts:
#	src/views/project/ProjectDetails.vue
2023-12-28 10:00:01 +08:00
zhangsir
aade4b9195 Merge branch 'master' into dev0731
# Conflicts:
#	src/views/project/ProjectDetails.vue
2023-12-27 18:28:35 +08:00
zhangsir
a984c7fec3 修改 2023-12-27 18:24:22 +08:00
zhangsir
a549ead248 Merge branch 'zcwy-dev' into dev0731 2023-12-27 10:57:16 +08:00
zhangsir
e678b5f894 Merge branch 'master' into dev0731 2023-12-27 10:56:04 +08:00
zhangsir
a2e6241abd Merge branch 'zcwy-dev' into boe-master 2023-12-27 10:40:25 +08:00
zhangsir
71ff0029d2 Revert "修改弹窗"
This reverts commit ca03cbf2a4.
2023-12-27 10:37:26 +08:00
zhangsir
3dbaf72d10 修改 2023-12-27 10:28:07 +08:00
zhangsir
ca03cbf2a4 修改弹窗 2023-12-26 17:48:11 +08:00
joshen
6b802a80ec Merge branch 'zcwy-dev' into 'master'
修改测试作业上传框定位问题

See merge request !39
2023-11-02 09:04:59 +08:00
joshen
5fa8ae1321 Merge branch 'zcwy-dev' into 'dev0731'
Zcwy dev

See merge request !38
2023-11-01 15:23:33 +08:00
nisen
1772ac929d 修改测试作业上传框定位问题 2023-11-01 15:22:00 +08:00
joshen
67e065366a Merge branch 'dev0731' into 'master'
注释放开

See merge request !37
2023-08-17 21:04:32 +08:00
nisen
ed8b51d862 注释放开 2023-08-15 10:45:29 +08:00
nisen
6607133096 注释打开 2023-08-14 17:14:37 +08:00
joshen
3a16da3b81 Merge branch 'dev0731' into 'master'
Dev0731

See merge request !36
2023-08-08 19:03:24 +08:00
nisen
9db5e79e93 课程组织修改 2023-08-08 16:05:17 +08:00
U-BOE\ZXYJY05
06713a6905 课程信息组织名称 2023-08-08 13:59:24 +08:00
yujicun
b407e514bf Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-08 11:00:03 +08:00
yujicun
42285378c1 Merge remote-tracking branch 'boe/cloud' into dev0731 2023-08-08 10:59:50 +08:00
U-BOE\ZXYJY05
96dc08c8d2 修改代理 2023-08-08 10:10:57 +08:00
yuping
4c20e271ea -- fix bug 2023-08-08 09:44:26 +08:00
U-BOE\ZXYJY05
54837c44d7 修改 2023-08-07 14:50:35 +08:00
U-BOE\ZXYJY05
b0ddea9eae util 2023-08-07 14:15:04 +08:00
U-BOE\ZXYJY05
ff4d4ca64a edit在线课程组织显示 2023-08-04 16:57:12 +08:00
yujicun
9330df8361 Merge remote-tracking branch 'origin/user-modify' into cloud 2023-08-03 14:31:02 +08:00
lims1@hunktimes.com
8b125de7e7 zcwy-dev 2023-08-01 16:49:31 +08:00
BOE\10867418
4d969916d6 Merge branch 'user-modify' into dev0731 2023-07-31 17:04:30 +08:00
NiSen
14d6637cd5 面授detai edit five pages 2023-07-24 16:43:04 +08:00
yuping
97221f680f user-modify 2023-07-03 10:56:38 +08:00
NiSen
932f0e9031 first 2023-06-13 15:28:37 +08:00
leyhome8
7a0cb0216d Initial commit 2023-06-13 13:26:30 +08:00
BOE\10867418
aec492a144 Merge branch 'dongwu-master' 2023-04-23 17:44:45 +08:00
于平
004b09f44d Merge branch 'develop' into 'master'
Develop

See merge request !2
2023-04-23 07:22:38 +00:00
yuping
21ce5db4e8 --fix bug 2023-04-20 17:27:11 +08:00
yuping
927c5529eb --fix bug 2023-04-20 16:00:44 +08:00
yuping
1bff9f0336 --fix 版本号 2023-04-20 11:11:13 +08:00
yuping
acdc10e9e8 --fix bug 2023-04-20 11:09:09 +08:00
BOE\10867418
08e6d14a74 Merge branch 'dongwu-master' 2023-04-17 15:12:12 +08:00
yuping
c2ee34db7a --fix 版本号 2023-04-17 11:23:52 +08:00
yuping
459c25e80c --fix bug 路径图 2023-04-13 15:27:16 +08:00
BOE\10867418
4a6cf5d268 Merge branch 'dongwu-master' 2023-04-11 10:16:51 +08:00
yuping
d1c9811f66 --fix bug 2023-04-10 16:49:41 +08:00
yuping
eaaea00764 Merge branch 'develop'
# Conflicts:
#	src/App.vue
#	src/views/survey/SurveyDetail.vue
2023-04-10 16:44:48 +08:00