Commit Graph

5789 Commits

Author SHA1 Message Date
gengxin
55cd6ff6c3 讲师费管理 分页 2025-03-04 20:56:14 +08:00
joshen
9cd0817a2c Merge remote-tracking branch '121/test20250220' into test20250220 2025-03-04 20:49:26 +08:00
joshen
39453366c8 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 20:48:51 +08:00
gengxin
2991a5e4f2 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 18:08:06 +08:00
gengxin
ce1e0faa8f 导出处理2 2025-03-04 18:07:52 +08:00
gengxin
393e6e3cf9 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 17:51:37 +08:00
gengxin
3a6271c41d 导出处理1 2025-03-04 17:51:17 +08:00
gengxin
1314ae5f72 导出处理1 2025-03-04 17:48:58 +08:00
gengxin
fd136c8c11 Merge branch '250213-prod-master_1202-gx' into test20250220
# Conflicts:
#	src/views/lecturer/OrganizationApproval.vue
2025-03-04 14:22:50 +08:00
gengxin
5975fd7533 审批中心4 2025-03-04 14:22:15 +08:00
gengxin
77df92eeca 审批中心3 2025-03-04 13:46:53 +08:00
gengxin
89fe426657 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 13:30:58 +08:00
gengxin
b73286cf14 审批中心2 2025-03-04 13:30:31 +08:00
gengxin
d083222c8f 审批中心2 2025-03-04 13:29:41 +08:00
gengxin
8f3365674f Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 10:40:47 +08:00
gengxin
51a2aeb25d 审批中心1 2025-03-04 10:40:27 +08:00
gengxin
fb40515014 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 10:25:20 +08:00
gengxin
dc58428bca 延时执行任务 1 2025-03-04 10:25:04 +08:00
gengxin
0f786e8d6d 延时执行任务 2025-03-04 10:24:30 +08:00
gengxin
4692a7457c Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 08:16:53 +08:00
gengxin
1607b149b5 执行子组件 2025-03-04 08:16:32 +08:00
gengxin
d5937b487e Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-04 07:27:50 +08:00
gengxin
97eb95b8c7 测试监听数据 2025-03-04 07:27:22 +08:00
gengxin
ce702daa45 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-03 20:34:11 +08:00
gengxin
64682c3933 编辑回显 2025-03-03 20:33:54 +08:00
gengxin
7c80972625 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-03 20:20:06 +08:00
gengxin
1ee31a2757 最大字符 50 2025-03-03 20:19:42 +08:00
gengxin
893fa5b6a6 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-03 20:05:58 +08:00
gengxin
0306031848 导出详细学习记录 - loading 更改 6 2025-03-03 20:05:30 +08:00
gengxin
0a77f11588 Merge branch 'compulsory_professional_skills_copy' into test20250220 2025-03-03 20:00:51 +08:00
gengxin
f0fc84936b Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 20:00:37 +08:00
gengxin
c6ed4769e0 导出详细学习记录 - loading 更改 5 2025-03-03 20:00:00 +08:00
gengxin
b23c65ae57 Merge branch 'compulsory_professional_skills_copy' into test20250220 2025-03-03 19:51:12 +08:00
gengxin
4ca885e88a Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 19:50:54 +08:00
gengxin
0c5c3308aa 导出详细学习记录 - loading 更改 5 2025-03-03 19:50:16 +08:00
gengxin
08157e4118 Merge branch 'compulsory_professional_skills_copy' into test20250220
# Conflicts:
#	src/components/student/OnlineClassModelStudent.vue
#	src/utils/zipdownload.js
2025-03-03 19:26:55 +08:00
gengxin
0601729fc6 Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 19:25:48 +08:00
gengxin
bd09fd3c57 导出详细学习记录 - loading 更改 4 2025-03-03 19:25:21 +08:00
gengxin
1ad9677c52 导出详细学习记录 - loading 更改 3 2025-03-03 19:15:27 +08:00
gengxin
ac2b607807 导出详细学习记录 - loading 更改 3 2025-03-03 19:11:05 +08:00
gengxin
e244c2a453 Merge branch 'compulsory_professional_skills_copy' into test20250220 2025-03-03 18:58:27 +08:00
gengxin
f02b8c5cf4 Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 18:58:00 +08:00
gengxin
e2958b6f2a 导出详细学习记录 - loading 更改 2 2025-03-03 18:57:41 +08:00
gengxin
c1fc617b7d 导出详细学习记录 - loading 更改 2 2025-03-03 18:57:04 +08:00
gengxin
b62477e49e Merge branch 'compulsory_professional_skills_copy' into test20250220 2025-03-03 18:44:04 +08:00
gengxin
ffb4b20299 Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 18:43:42 +08:00
gengxin
4113c035b3 导出详细学习记录 - loading 更改 1 2025-03-03 18:42:58 +08:00
gengxin
7ff9354720 Merge branch 'compulsory_professional_skills_copy' into test20250220 2025-03-03 18:21:36 +08:00
gengxin
37cb5574c7 Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy 2025-03-03 18:21:09 +08:00
gengxin
0a164c54eb Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy 2025-03-03 18:21:00 +08:00