Commit Graph

121 Commits

Author SHA1 Message Date
李京通 fe3d8e6341 feat: 返回已用数据 2025-06-11 15:10:01 +08:00
李京通 1a238fcf42 Merge remote-tracking branch 'origin/master' 2025-06-10 11:42:38 +08:00
李京通 bff5fa5b73 feat: 休假审批流程 2025-06-10 11:42:30 +08:00
hanrenchun 01494a09d3 Merge remote-tracking branch 'origin/master' 2025-06-10 11:26:10 +08:00
hanrenchun a75fab9697 修改 2025-06-10 11:26:00 +08:00
李京通 7a3f1498c2 feat: 休假审批流程 2025-06-10 10:59:07 +08:00
李京通 8639188e65 Merge remote-tracking branch 'origin/master' 2025-06-10 10:58:23 +08:00
李京通 c73423e5a4 feat: 休假审批流程 2025-06-10 10:58:17 +08:00
hanrenchun 870b22dd2e Merge remote-tracking branch 'origin/master' 2025-06-10 09:48:24 +08:00
hanrenchun c23b3bdff7 修改 2025-06-10 09:48:15 +08:00
李京通 17632061bf feat: 休假审批流程 2025-06-10 09:35:17 +08:00
李京通 f587f94657 feat: 时间、reason 2025-06-10 00:40:56 +08:00
李京通 51112f346e Merge remote-tracking branch 'origin/master' 2025-06-10 00:30:17 +08:00
李京通 d4a3d1097b feat: 时间、reason 2025-06-10 00:30:10 +08:00
hanrenchun e5bc9c7dac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
2025-06-10 00:29:30 +08:00
hanrenchun 5b7b821e8b 修改 2025-06-10 00:28:15 +08:00
李京通 4e4aa7f95a feat: 时间、reason 2025-06-10 00:09:35 +08:00
李京通 673482afd3 Merge remote-tracking branch 'origin/master' 2025-06-09 23:53:04 +08:00
李京通 e60d556bbf feat: 当前部门出现在最顶部 2025-06-09 23:52:58 +08:00
hanrenchun aaaaf826fd 修改 2025-06-09 23:51:30 +08:00
hanrenchun 77819056a5 Merge remote-tracking branch 'origin/master' 2025-06-09 23:41:46 +08:00
hanrenchun d521574abc 修改 2025-06-09 23:41:38 +08:00
李京通 5e89c0725d Merge remote-tracking branch 'origin/master' 2025-06-09 23:38:51 +08:00
李京通 a0b8e78c96 feat: 当前部门出现在最顶部 2025-06-09 23:38:45 +08:00
hanrenchun bbd9f9a98e Merge remote-tracking branch 'origin/master' 2025-06-09 23:09:39 +08:00
hanrenchun ffd85c9ae2 修改 2025-06-09 23:09:30 +08:00
李京通 c667ab6f30 feat: 当前部门出现在最顶部 2025-06-09 23:03:53 +08:00
hanrenchun ac57acc4b2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
2025-06-09 22:52:14 +08:00
hanrenchun 90b56cb553 修改 2025-06-09 22:50:57 +08:00
李京通 41cb9852ca feat: 请假 2025-06-09 21:51:54 +08:00
李京通 c770cacd0a feat: 请假 2025-06-09 21:42:38 +08:00
hanrenchun 43129b0bca 修改 2025-06-09 21:12:50 +08:00
hanrenchun a0e79e24ab Merge remote-tracking branch 'origin/master' 2025-06-09 20:54:08 +08:00
hanrenchun 06aec0a0cf 修改 2025-06-09 20:53:59 +08:00
李京通 87a09f20d1 feat: 请假 2025-06-09 20:16:56 +08:00
hanrenchun cf2cfa2bb6 修改 2025-06-09 20:01:20 +08:00
hanrenchun 6cdd8462f6 Merge remote-tracking branch 'origin/master' 2025-06-09 19:42:21 +08:00
hanrenchun 99bd9edd43 修改 2025-06-09 19:42:12 +08:00
李京通 34b457f2e7 feat: 请假 2025-06-09 19:30:32 +08:00
李京通 c7162afbbb Merge remote-tracking branch 'origin/master' 2025-06-09 19:22:27 +08:00
李京通 826544af13 feat: 请假 2025-06-09 19:22:21 +08:00
hanrenchun b0081791c0 Merge remote-tracking branch 'origin/master' 2025-06-09 19:15:48 +08:00
hanrenchun 064fee9163 修改 2025-06-09 19:15:39 +08:00
李京通 b420156e30 feat: 请假 2025-06-09 19:15:00 +08:00
李京通 763c3a5203 Merge remote-tracking branch 'origin/master' 2025-06-09 18:57:13 +08:00
李京通 a07aa0095d feat: 请假 2025-06-09 18:57:07 +08:00
hanrenchun 61f768d8a9 修改 2025-06-09 18:39:58 +08:00
hanrenchun 8d24f79c0e 修改 2025-06-09 18:39:19 +08:00
李京通 08a76313dc feat: 喝酒创建时间 2025-06-09 16:55:25 +08:00
李京通 ee741be56e Merge remote-tracking branch 'origin/master' 2025-06-09 16:47:33 +08:00