5697 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
gengxin	80cca534c3	解决 bug	2025-02-24 09:26:39 +08:00
gengxin	87363e6ba4	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-24 09:20:22 +08:00
gengxin	7023a8bdd9	供应商	2025-02-24 09:20:00 +08:00
gengxin	e42665ceb9	Merge remote-tracking branch 'gitOrigin/test20250220' into test20250220	2025-02-24 09:09:09 +08:00
joshen	ae59d25ae9	Merge remote-tracking branch '121/test20250220' into test20250220	2025-02-22 17:55:46 +08:00
joshen	2a39adca7a	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-22 17:55:11 +08:00
gengxin	411731bbb1	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-22 17:50:21 +08:00
gengxin	26c33caec4	课程类型	2025-02-22 17:49:53 +08:00
gengxin	d47f9fa788	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 18:51:44 +08:00
gengxin	bb60b214db	初始化转改	2025-02-21 18:51:15 +08:00
gengxin	34620a1143	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 17:42:24 +08:00
gengxin	f971fc45f3	初始化转改	2025-02-21 17:41:48 +08:00
gengxin	9f049af934	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 17:35:52 +08:00
gengxin	d74eab17fd	初始化转改	2025-02-21 17:35:28 +08:00
gengxin	b5aef87720	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 17:28:57 +08:00
gengxin	cf84a12ac5	审批内容	2025-02-21 17:28:25 +08:00
gengxin	0aa2426cd1	Merge branch 'compulsory_professional_skills' into test20250220	2025-02-21 17:14:14 +08:00
Pengxiansen	348977347f	提交	2025-02-21 17:09:40 +08:00
gengxin	52731af46d	Merge branch 'compulsory_professional_skills' into test20250220	2025-02-21 16:43:30 +08:00
Pengxiansen	3727c31a94	提交	2025-02-21 16:40:19 +08:00
gengxin	6b39574ca4	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:34:36 +08:00
gengxin	a3e4615ce4	内部讲师 导入模版	2025-02-21 16:34:09 +08:00
gengxin	2e80cf8c13	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:25:28 +08:00
gengxin	4cfb11b911	内部讲师 导入模版	2025-02-21 16:25:06 +08:00
gengxin	09d7d627e5	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:22:09 +08:00
gengxin	c010a91d18	导入模版	2025-02-21 16:21:48 +08:00
gengxin	9518b50a11	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:17:18 +08:00
gengxin	ad7d10d540	导入模版	2025-02-21 16:16:52 +08:00
gengxin	7c7911cc7c	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:10:40 +08:00
gengxin	aee1d64e81	导入模版	2025-02-21 16:10:15 +08:00
gengxin	fc9ea46973	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 16:04:44 +08:00
gengxin	cda14423ac	导入模版	2025-02-21 16:04:13 +08:00
gengxin	8b2dbceaf2	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 15:36:18 +08:00
gengxin	d7738f023a	课程类型	2025-02-21 15:35:30 +08:00
gengxin	d38227d7af	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 14:19:08 +08:00
gengxin	3c11652dab	课程类型	2025-02-21 14:17:02 +08:00
gengxin	cfb3598b9c	Merge branch 'compulsory_professional_skills' into test20250220	2025-02-21 14:09:14 +08:00
gengxin	9ceaeb0eaf	课程类型	2025-02-21 14:07:01 +08:00
Pengxiansen	01ab826dcf	提交	2025-02-21 14:04:17 +08:00
gengxin	b05d2d7d31	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 13:47:49 +08:00
gengxin	ef90925b89	导入模版	2025-02-21 13:47:27 +08:00
gengxin	0973ecdbb4	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 11:44:41 +08:00
gengxin	1d53b59006	手动录入修改	2025-02-21 11:44:05 +08:00
gengxin	e5948d84e1	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 11:41:15 +08:00
gengxin	6daf861bc8	手动录入修改	2025-02-21 11:40:54 +08:00
gengxin	bffae06e01	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 11:36:10 +08:00
gengxin	2e90a8832f	手动录入修改	2025-02-21 11:35:53 +08:00
gengxin	8a5655ed87	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 11:24:23 +08:00
gengxin	8c13cb99e5	讲师费月度	2025-02-21 11:24:07 +08:00
gengxin	7a511b2691	Merge branch '250213-prod-master_1202-gx' into test20250220 ... # Conflicts: # src/views/lecturer/OrganizationApproval.vue	2025-02-21 11:02:32 +08:00