Commit Graph

1004 Commits

Author SHA1 Message Date
zhangsir
a3f1b2d5f8 项目课程显示回滚 2024-05-26 20:25:10 +08:00
joshen
d2690b7703 Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !49
2024-05-25 22:37:25 +08:00
670788339
739ba9c626 Merge remote-tracking branch 'yunxiao/master' into zcwy-zsx 2024-05-25 22:35:54 +08:00
zhangsir
a94ce3f20a 项目课程显示 2024-05-25 22:30:59 +08:00
joshen
bb667ddfe7 Merge branch 'zcwy-zsx' into 'master'
接口修改为post

See merge request !48
2024-05-20 18:31:52 +08:00
zhangsir
0e74a6d927 接口修改为post 2024-05-20 17:36:30 +08:00
joshen
a40d7b2f0f Merge branch 'zcwy-zsx' into 'master'
接口修改

See merge request !47
2024-05-20 16:01:24 +08:00
zhangsir
ae261f0cf9 接口修改 2024-05-20 15:55:17 +08:00
joshen
bbb4e8f125 Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !46
2024-05-17 22:42:38 +08:00
zhangsir
494162eed4 外链 2024-05-17 22:39:43 +08:00
zhangsir
152074109b 增加状态 2024-05-16 13:31:49 +08:00
joshen
f4a366ef4f Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !45
2024-04-09 18:21:31 +08:00
zhangsir
f2079db2c9 评估编辑名称 2024-03-29 16:00:56 +08:00
zhangsir
5ee0d1ff89 评估回退 2024-03-29 14:48:24 +08:00
zhangsir
8334817de9 评估回退 2024-03-29 14:48:03 +08:00
zhangsir
3d0270e351 评估 2024-03-28 17:51:25 +08:00
zhangsir
5aecdad351 提交增加参数 2024-03-28 10:09:53 +08:00
joshen
abdceddba9 Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !44
2024-03-21 17:26:54 +08:00
zhangsir
83b889b269 提交增加参数 2024-03-21 10:00:39 +08:00
zhangsir
288037efea 评估修改 2024-03-20 16:31:24 +08:00
joshen
f284aa276a Merge branch 'zcwy-zsx' into 'master'
评估强制完成

See merge request !43
2024-03-05 09:21:30 +08:00
zhangsir
62fc236e01 评估强制完成 2024-03-04 16:16:16 +08:00
joshen
e456750ed1 Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !42
2024-03-01 15:19:00 +08:00
zhangsir
be6a7d979b 添加boe教师的显示 2024-02-29 17:31:40 +08:00
zhangsir
f16db3c4e0 剔除boe教师的显示 2024-02-29 16:44:55 +08:00
zhangsir
683db96b97 修改教师显示顺序 2024-02-29 16:15:04 +08:00
zhangsir
0e2d328a13 名称是否显示 2024-02-27 09:57:39 +08:00
zhangsir
18d9972e80 修改项目名称显示隐藏 2024-02-27 09:28:56 +08:00
joshen
29fa0973a4 Merge branch 'zcwy-zsx' into 'master'
添加弹窗

See merge request !41
2024-02-23 10:02:32 +08:00
zhangsir
a11065e9e8 修改弹窗语句 2024-02-23 09:18:42 +08:00
zhangsir
66f684b42c 添加弹窗 2024-02-23 09:11:38 +08:00
zhangsir
fae88900fb Merge branch 'zcwy-zsx' into dev0731 2024-02-22 16:07:56 +08:00
zhangsir
d5da2e4378 添加弹窗 2024-02-22 16:07:09 +08:00
zhangsir
d4e7f8bab2 评估显示 2024-02-05 13:13:57 +08:00
zhangsir
e3fbb47fd9 评估显示 2024-02-05 11:16:58 +08:00
zhangsir
42a510e059 多教师显示 2024-02-05 10:17:05 +08:00
zhangsir
d787275fb0 项目评估 2024-02-02 16:21:33 +08:00
zhangsir
0f789e5550 Merge branch 'dev0731' into zcwy-dev 2024-02-02 15:45:55 +08:00
zhangsir
9b5db63047 评估修改 2024-02-02 15:45:16 +08:00
zhangsir
32c9135db7 Merge branch 'master' into dev0731 2024-02-02 09:37:34 +08:00
zhangsir
6d607db468 Merge branch 'master' into zcwy-dev 2024-02-02 09:37:00 +08:00
zhangsir
6d15f387ae 开课名称 2024-02-02 09:36:26 +08:00
zhangsir
fdc699ac5a Merge branch 'master' into dev0731 2024-01-30 09:32:00 +08:00
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