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 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								d6591c281b
								
							
						 | 
						
							
							
								
								feat: 抄送
							
							
							
							
							
						 | 
						
							2025-06-09 16:47:15 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								51a5d0bc6b
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 16:46:59 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								96af4f42f5
								
							
						 | 
						
							
							
								
								feat: 获取家人手机号
							
							
							
							
							
						 | 
						
							2025-06-09 16:07:47 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								58b434d16e
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 15:57:50 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								bb94fcc4d4
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 15:50:24 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								546cf13f34
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 15:29:04 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								1563f94964
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 14:53:28 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								4da51506b0
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 14:46:10 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								c1c10c8f7f
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 14:42:15 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								b7cd632f12
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2025-06-09 14:41:24 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								7af36f3ee9
								
							
						 | 
						
							
							
								
								feat:审批
							
							
							
							
							
						 | 
						
							2025-06-09 14:41:17 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								49287990a9
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 14:38:59 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								2fa0201732
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2025-06-09 11:55:50 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								89d1c82b7c
								
							
						 | 
						
							
							
								
								feat:showtime
							
							
							
							
							
						 | 
						
							2025-06-09 11:55:44 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								de36e69a7f
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 11:40:16 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								4cd3123d9a
								
							
						 | 
						
							
							
								
								feat:showtime
							
							
							
							
							
						 | 
						
							2025-06-09 11:11:32 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								4b0340d2b0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2025-06-09 11:11:03 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								aee089ef37
								
							
						 | 
						
							
							
								
								feat:showtime
							
							
							
							
							
						 | 
						
							2025-06-09 11:10:56 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								d88a13561e
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 11:10:23 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								ec0b7aedc2
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 10:42:10 +08:00 | 
						
					
				
					
						
							
							
								 
								hanrenchun
							
						 | 
						
							
							
							
							
							
								
							
							
								3e464f97ed
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2025-06-09 10:00:49 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								947e8bf472
								
							
						 | 
						
							
							
								
								feat:profile
							
							
							
							
							
						 | 
						
							2025-06-08 15:38:27 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								633e797908
								
							
						 | 
						
							
							
								
								feat:profile
							
							
							
							
							
						 | 
						
							2025-06-08 14:37:41 +08:00 | 
						
					
				
					
						
							
							
								
								 李京通
							
						 | 
						
							
							
							
							
							
								
							
							
								57aa3ffc18
								
							
						 | 
						
							
							
								
								feat:
							
							
							
							
							
						 | 
						
							2025-06-08 14:05:42 +08:00 |