zhangsir
|
5ec155dc2a
|
Merge remote-tracking branch 'origin/zcwy-0511-out' into zcwy-0511-out
# Conflicts:
# src/views/gratefulteacher/InstructorCertification.vue
# src/views/gratefulteacher/LecturerManagement.vue
# src/views/gratefulteacher/tablemodel.vue
|
2024-05-15 09:47:32 +08:00 |
|
zhangsir
|
c57eac8da6
|
修改
|
2024-05-15 09:40:47 +08:00 |
|
zhangsir
|
99fb00aeda
|
修改接口
|
2024-05-15 09:36:18 +08:00 |
|
zhangsir
|
df68abccf1
|
修改
|
2024-05-15 09:06:35 +08:00 |
|
zhangsir
|
3bc3954fe9
|
修改
|
2024-05-15 08:54:57 +08:00 |
|
zhangsir
|
aafca5b2d1
|
修改
|
2024-05-15 08:51:50 +08:00 |
|
zhangsir
|
5dd3f02bf7
|
修改
|
2024-05-15 00:47:02 +08:00 |
|
zhangsir
|
b4b614d18e
|
细节修改,并且查漏
|
2024-05-15 00:44:58 +08:00 |
|
zhangsir
|
3799fd7c2b
|
Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
|
2024-05-14 23:06:58 +08:00 |
|
zhangsir
|
d06ea86148
|
讲师认证
|
2024-05-14 20:26:00 +08:00 |
|
zhangsir
|
210c2c82d4
|
讲师认证
|
2024-05-14 20:25:35 +08:00 |
|
zhangsir
|
1276279733
|
Merge branch 'zcwy-0511-out' into dev0223
|
2024-05-14 20:21:44 +08:00 |
|
zhangsir
|
5807987c5a
|
讲师认证
|
2024-05-14 20:21:16 +08:00 |
|
zhangsir
|
50b154d470
|
Merge branch 'zcwy-0511-out' into dev0223
|
2024-05-14 19:23:56 +08:00 |
|
zhangsir
|
9adc7de7bc
|
讲师认证
|
2024-05-14 19:21:33 +08:00 |
|
zhangsir
|
b1c05c3fbc
|
Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
# Conflicts:
# src/api/examineApi.js
# src/views/gratefulteacher/InstructorCertification.vue
|
2024-05-14 18:26:52 +08:00 |
|
zhangsir
|
ddef0cd1fd
|
讲师管理
|
2024-05-14 18:24:10 +08:00 |
|
zhangsir
|
7b83673353
|
Merge remote-tracking branch 'origin/zcwy-0511-out' into zcwy-0511-out
|
2024-05-14 18:02:09 +08:00 |
|
zhangsir
|
a046bd648a
|
提交
|
2024-05-14 18:01:45 +08:00 |
|
zhangsir
|
28221766b6
|
讲师管理
|
2024-05-14 16:58:10 +08:00 |
|
zhangsir
|
df191dd843
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-14 15:34:41 +08:00 |
|
zhangsir
|
bd9f9d16d8
|
修改项目学院状态,带参数
|
2024-05-14 15:33:56 +08:00 |
|
zhangsir
|
c209b15811
|
Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
|
2024-05-14 13:41:56 +08:00 |
|
zhangsir
|
17a5e51ee0
|
讲师认证管理认证
|
2024-05-14 13:41:42 +08:00 |
|
zhangsir
|
133bccd0aa
|
提交
|
2024-05-14 13:40:34 +08:00 |
|
zhangsir
|
3d0915f7ec
|
讲师认证管理认证
|
2024-05-13 22:39:57 +08:00 |
|
joshen
|
a763412381
|
Merge branch 'zcwy-zsx0223' into 'master'
Zcwy zsx0223
See merge request !175
|
2024-05-13 20:58:32 +08:00 |
|
zhangsir
|
3033a32a7f
|
Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
|
2024-05-13 20:04:38 +08:00 |
|
zhangsir
|
9091e9398d
|
讲师认证管理认证
|
2024-05-13 20:04:23 +08:00 |
|
zhangsir
|
72635c6c87
|
Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
# Conflicts:
# src/views/gratefulteacher/LecturerManagement.vue
|
2024-05-13 20:01:56 +08:00 |
|
zhangsir
|
48675a34e3
|
讲师认证
|
2024-05-13 19:52:42 +08:00 |
|
zhangsir
|
b620a7fd16
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-13 19:01:03 +08:00 |
|
zhangsir
|
095f661918
|
左侧列表权限受控,修改备注
|
2024-05-13 19:00:32 +08:00 |
|
zhangsir
|
9ead7c7f4d
|
讲师认证管理认证
|
2024-05-13 18:50:27 +08:00 |
|
ocya
|
a4001cfcf2
|
提交
|
2024-05-12 00:29:58 +08:00 |
|
zhangsir
|
2069cadc5c
|
Merge branch 'zcwy-0425-remark' into zcwy-0415
|
2024-05-11 22:33:31 +08:00 |
|
zhangsir
|
babe05c7d4
|
Merge branch 'zcwy-0511-out2' into zcwy-0511-out
# Conflicts:
# src/api/examineApi.js
# src/views/gratefulteacher/AddLevelImportTec.vue
# src/views/gratefulteacher/InstructorCertification.vue
# src/views/gratefulteacher/LecturerManagement.vue
|
2024-05-11 22:22:21 +08:00 |
|
zhangsir
|
f60e70f7d3
|
讲师认证2
|
2024-05-11 21:55:20 +08:00 |
|
zhangsir
|
f58ae089f2
|
讲师认证
|
2024-05-11 21:52:29 +08:00 |
|
zhangsir
|
726e577c52
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-09 15:42:18 +08:00 |
|
zhangsir
|
b2a40b49c1
|
下载按钮新增参数
|
2024-05-09 15:41:50 +08:00 |
|
zhangsir
|
89d6cf27f0
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-09 15:25:20 +08:00 |
|
zhangsir
|
11d2b3885e
|
下载按钮权限增加新接口受控
|
2024-05-09 15:24:55 +08:00 |
|
zhangsir
|
6b289a0cee
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-09 14:56:37 +08:00 |
|
zhangsir
|
18dc61cd9d
|
下载按钮权限受控
|
2024-05-09 14:56:08 +08:00 |
|
zhangsir
|
f8bd0b2c80
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-09 13:36:35 +08:00 |
|
zhangsir
|
66e719bad7
|
项目里考试状态修改
|
2024-05-09 13:35:40 +08:00 |
|
zhangsir
|
afbd47e10f
|
Merge branch 'zcwy-0415' into dev0223
|
2024-05-08 17:27:47 +08:00 |
|
zhangsir
|
8fc3776477
|
在线课程学员状态改变
|
2024-05-08 17:27:18 +08:00 |
|
zhangsir
|
ec10639c57
|
在线课程学员状态改变
|
2024-05-08 17:25:40 +08:00 |
|