5348 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
gengxin	30d6d5ffc1	审批全部	2025-02-21 11:01:54 +08:00
gengxin	4c91874ee0	审核中心全部数据	2025-02-21 10:35:46 +08:00
gengxin	30ef4b672f	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 10:27:50 +08:00
gengxin	d7196827e0	上传文件	2025-02-21 10:27:11 +08:00
gengxin	27bb696b2a	上传文件	2025-02-21 09:30:27 +08:00
gengxin	a6841717bd	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 09:18:01 +08:00
gengxin	9589e62593	上传文件	2025-02-21 09:17:39 +08:00
gengxin	8244d7a099	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-21 08:51:52 +08:00
gengxin	23b94f5cb1	课酬基准	2025-02-21 08:51:31 +08:00
gengxin	329d4c2a11	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 21:30:53 +08:00
gengxin	81d8040524	课酬基准	2025-02-20 21:30:29 +08:00
gengxin	728ea01a50	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 21:21:31 +08:00
gengxin	8e9b5a156c	课酬基准	2025-02-20 21:21:09 +08:00
gengxin	7ed54dfa3a	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 21:17:48 +08:00
gengxin	72d8c434b6	课酬基准	2025-02-20 21:17:29 +08:00
gengxin	7c818981fa	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 21:06:23 +08:00
gengxin	fce24f07b1	课酬基准	2025-02-20 21:05:59 +08:00
gengxin	da0bb65174	Merge branch 'compulsory_professional_skills' into test20250220	2025-02-20 20:57:56 +08:00
gengxin	7f9b883d02	Merge remote-tracking branch 'gitOrigin/test20250220' into test20250220	2025-02-20 20:42:50 +08:00
gengxin	08b74ead2a	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 20:42:27 +08:00
gengxin	62c3c7df7a	费用管理，已停用	2025-02-20 20:42:07 +08:00
joshen	4cfc7daf1d	Merge remote-tracking branch '121/test20250220' into test20250220	2025-02-20 20:32:04 +08:00
gengxin	a6a0079219	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 20:28:37 +08:00
Pengxiansen	3e86caab15	提交	2025-02-20 20:28:30 +08:00
gengxin	08341efa12	供应商	2025-02-20 20:28:18 +08:00
gengxin	cf67ca5e0e	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 20:23:27 +08:00
gengxin	c8385c8949	供应商	2025-02-20 20:23:11 +08:00
gengxin	06f023ba83	Merge branch '250213-prod-master_1202-gx' into test20250220 ... # Conflicts: # src/views/lecturer/ExternalTeaching.vue	2025-02-20 20:17:15 +08:00
gengxin	d209c29e3d	供应商	2025-02-20 20:16:14 +08:00
gengxin	7d29b334cd	供应商	2025-02-20 20:14:31 +08:00
gengxin	e06bbdd1df	供应商	2025-02-20 20:12:31 +08:00
gengxin	9e97d6642b	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 17:56:25 +08:00
gengxin	f73b896d18	讲师查询管理供应商	2025-02-20 17:55:58 +08:00
gengxin	d92c56fe73	Merge branch '250213-prod-master_1202-gx' into test20250220	2025-02-20 17:43:24 +08:00
gengxin	6c5090503a	讲师查询管理供应商	2025-02-20 17:34:44 +08:00
gengxin	ebf77871c9	讲师查询管理供应商	2025-02-20 17:29:49 +08:00
gengxin	4e9e45bc04	讲师查询管理供应商	2025-02-20 17:22:44 +08:00
gengxin	43d321403a	讲师查询管理供应商	2025-02-20 17:09:39 +08:00
Pengxiansen	5dc774f312	提交	2025-02-20 16:36:25 +08:00
gengxin	e28255f406	讲师费用挂历	2025-02-20 15:40:07 +08:00
gengxin	0093259b70	讲师费用挂历	2025-02-20 14:53:30 +08:00
gengxin	7730ef8cff	审批审批过程 ，删除按钮显示	2025-02-20 13:54:38 +08:00
gengxin	dd53e572e7	审批审批过程 ，删除按钮显示	2025-02-20 13:23:30 +08:00
gengxin	73e4bc4290	审批审批过程 ，删除按钮显示	2025-02-20 10:28:22 +08:00
gengxin	a3e8c7f3bb	审批审批过程 ，撤销按钮	2025-02-20 10:18:01 +08:00
gengxin	28ea499047	审批 审核通过	2025-02-20 10:12:17 +08:00
gengxin	7b66b50da2	查询提交处理	2025-02-20 09:26:06 +08:00
gengxin	8fcd795421	审批中心	2025-02-19 17:23:58 +08:00
joshen	3f8e42a239	Merge remote-tracking branch 'yx/compulsory_professional_skills' into compulsory_professional_skills	2025-02-19 16:56:30 +08:00