[33mcommit a2afb4604d2987e9b1d7af993a16475442010a29[m[33m ([m[1;36mHEAD -> [m[1;32mdev[m[33m)[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Jul 23 16:50:12 2024 +0800 学时审核导出 [33mcommit 2e85a5f19cabddc725ce0b2db845e1fc49eeae9c[m[33m ([m[1;32morigin[m[33m)[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Jul 23 14:43:32 2024 +0800 学习审核不通过记录导出 [33mcommit 22dd469d6a8fbbd562bc3b01253cd2c101e425b6[m[33m ([m[1;31morigin/dev[m[33m)[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Jun 25 10:16:19 2024 +0800 fix [33mcommit 87092125d00bfb06ab3ac4014b47351e24090160[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Mon Jun 24 17:40:00 2024 +0800 update:学时审核超过20分钟标红背景 [33mcommit ec21744b8f622ccd02ea45b8c34ab61e6b2bad12[m Merge: 126beaa 8382785 Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Fri Jun 14 14:02:18 2024 +0800 合并失败 [33mcommit 126beaac0ce27ab25ecbc08197ca292b74fdf186[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Fri Jun 14 14:00:28 2024 +0800 fix [33mcommit 8382785832a08ce667803a1062c2e436aab4c869[m Author: xiexaing Date: Fri Jun 14 13:41:33 2024 +0800 feat:学时管理学时审核新增全选弹窗提示操作 [33mcommit 6af0ad6270ff8cf67aa14c474f245bb845946030[m Author: xiexaing Date: Wed Jun 5 10:47:47 2024 +0800 fix:学时审核（图片显示） [33mcommit 18d7a00fb511dbc65dc19c0777d91450352a7d12[m Merge: 5d9812d c8083ca Author: xiexaing Date: Fri May 24 17:51:00 2024 +0800 Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev [33mcommit 5d9812de865ef6f8c2269a7f32d890dbbb686a0e[m Author: xiexaing Date: Fri May 24 17:50:56 2024 +0800 fix:优化下载加载效果 [33mcommit c8083ca1f1a2c4ad65b02f342bf4fab000ac47ca[m[33m ([m[1;31morigin/master[m[33m, [m[1;32mmaster[m[33m)[m Merge: a91d7c2 f30181f Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Fri May 24 17:49:32 2024 +0800 fix [33mcommit a91d7c23e3fc454135a93100a283020ce3718f34[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Fri May 24 17:38:52 2024 +0800 fix [33mcommit f30181fa6dd605c518e98ed45ab6588f7d2dcb31[m Author: xiexaing Date: Fri May 24 16:28:49 2024 +0800 fix:完善档案管理批量下载功能，报考数据导入加载效果，修复问题 [33mcommit 936d0476049123373a65b5ec5c63b8b50f049971[m Author: xiexaing Date: Wed May 22 17:14:50 2024 +0800 1.删除重复代码 [33mcommit 4a46c8903daaccf1907363ffb5f23d77ee22fcd5[m Merge: cb2d33b c0222d5 Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Wed May 22 16:32:57 2024 +0800 fix [33mcommit cb2d33b009c80ca9faa0ea36b646e6d74e049d68[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Wed May 22 16:29:21 2024 +0800 fix [33mcommit c0222d5eb245b8cc92006d65c1542a28234c54d6[m Merge: 292a658 829f2e6 Author: xiexaing Date: Wed May 22 16:23:52 2024 +0800 Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev # Conflicts: # src/views/education/classManageMent/classList/trainee/index.vue # src/views/resource/videoManagement/courseManagement/chapterContent/index.vue [33mcommit 292a658686772c9bc06f7d3a1233c20f8641d304[m Author: xiexaing Date: Wed May 22 16:18:19 2024 +0800 档案管理——批量/个人/记录（导出）调整 [33mcommit 829f2e641c341af10c9a31c0be7bf3f2bf24f542[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Wed May 22 10:49:09 2024 +0800 fix [33mcommit cff0dfa5bbe62c18a667561bd7e873555c422fed[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Mon May 20 16:06:29 2024 +0800 fix [33mcommit 4535db1e46e14641e178c551772472b346dc97d6[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Mon May 20 10:35:39 2024 +0800 fix [33mcommit ba9a23719b5e9a2a23266bdc294625879aa4ffaa[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Mon May 20 09:44:22 2024 +0800 课程关联试卷优化 [33mcommit f282129ff10f136a98d05778ab6e758b4255d860[m Author: xiexaing Date: Fri May 17 17:11:45 2024 +0800 1.优化筛选统计组件css效果2.关联试卷(业务层级-超出3显示popover) [33mcommit cbb24e462ff0b3e6a81befe0cdd0e3da2c2f58b5[m Author: xiexaing Date: Wed May 15 09:47:02 2024 +0800 1.perf:班级学员增加“信息已推送”“信息待推送”统计及筛选功能 [33mcommit b302e93f60ee15a3ca5d6af3defa368f31e069b2[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue May 14 12:02:35 2024 +0800 补考商品 [33mcommit 5b941b5c1fe209c482ce1b0b6a8870af498251cd[m Author: xiexaing Date: Mon May 13 17:59:45 2024 +0800 1.fix:修复 [33mcommit 45f4026059c18c363b16c5099387005020b1ffa2[m Author: xiexaing Date: Mon May 13 15:07:57 2024 +0800 1.fix:报考数据—批量导入列表（新增是否补考学员） [33mcommit 793d56302291c49e9134dc096a9fa67d9e7984a3[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Mon May 13 15:05:39 2024 +0800 需求修改 [33mcommit d1cf84999e2d9504d2d59d0a21125ae1c72028cf[m Merge: 1191c68 a28b8af Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Thu May 9 09:22:36 2024 +0800 保利威腾讯视频合并 [33mcommit 1191c68f256cf705fb7019d2ec8d16d9fa9edec0[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Thu May 9 08:50:34 2024 +0800 fix [33mcommit 30c3dfdd4e7737f644e9d1de3cc43fdda27277db[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Wed May 8 08:56:24 2024 +0800 施工继教需求调整 [33mcommit 7ebb9e0880ae6327537b442a1596bb755dcdf072[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Apr 30 16:40:17 2024 +0800 fix [33mcommit f96d5198dde92ef992fbf3aabcc3cd9461daefd2[m Merge: 4ce09cb 2431f65 Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Apr 30 15:07:46 2024 +0800 商品包合并 [33mcommit 4ce09cb56087cbe0b4241c24bebb5a1d173724a0[m Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Tue Apr 30 15:02:31 2024 +0800 班级管理需求 [33mcommit 2431f65d915f2c6a46f9c71c15c5b8952308d05b[m Author: xiexaing Date: Tue Apr 30 11:35:28 2024 +0800 1.完善商品包功能模块 [33mcommit a0e5a6674abc9a91b51316e7389e89ca19ec9bba[m Author: xiexaing Date: Mon Apr 29 17:58:58 2024 +0800 1.fix:修复 [33mcommit ead90bb6202412b6cdaec0a9e0cb1816a45e738f[m Author: xiexaing Date: Mon Apr 29 10:54:52 2024 +0800 1.perf：优化加载提示，fix：修改字段名称 [33mcommit 535748b75a36361e51ce03b50d2890bb4bad1d13[m Author: xiexaing Date: Mon Apr 22 16:00:33 2024 +0800 1.fix:试卷管理—编辑试卷题目内容（修复参数为null问题） [33mcommit c24c1b035ae3d9eeeaed1d61fcb623647fc475de[m Author: xiexaing Date: Fri Apr 19 17:25:08 2024 +0800 1.fix:试卷管理—添加试卷题目内容（修复参数为null问题） [33mcommit f067d20e20263bba730e176a11e2f877ee53365f[m Merge: ac29dd5 66a78ff Author: xiexaing Date: Wed Apr 17 08:40:27 2024 +0800 Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev [33mcommit 66a78ff6a07cd57f9cfbd727a84c1ddb1974fc12[m Merge: 6fab979 dd3d54e Author: En route <8879109+tanglianfeng@user.noreply.gitee.com> Date: Wed Apr 17 08:39:43 2024 +0800 Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into