| 
						
					 | 
					
						
						
							
						
						e50082fe20
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2025-02-27 10:03:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4988f42d0b
					 | 
					
						
						
							
							上下班缺卡定时任务
						
						
						
						
						
						
					 | 
					
						2025-02-27 10:03:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f6b8b0fe26
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-02-26 18:49:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65ce01c325
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-02-26 18:43:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ef339849e
					 | 
					
						
						
							
							消息发送完成
						
						
						
						
						
						
					 | 
					
						2025-02-26 15:34:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						43932d7555
					 | 
					
						
						
							
							修改:招工列表、申请报名
						
						
						
						
						
						
					 | 
					
						2025-02-25 19:22:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aeb17a9fb4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2025-02-25 18:14:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a27cccc3c
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-02-25 18:14:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02c2960af4
					 | 
					
						
						
							
							修改用户通用附件获取
						
						
						
						
						
						
					 | 
					
						2025-02-25 17:59:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						293560e4a3
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-02-25 17:13:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cffc1422b0
					 | 
					
						
						
							
							修改工资结算
						
						
						
						
						
						
					 | 
					
						2025-02-25 15:06:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						89a92e0b8a
					 | 
					
						
						
							
							新增消息列表及其它细节修改
						
						
						
						
						
						
					 | 
					
						2025-02-25 14:01:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7939e5c19
					 | 
					
						
						
							
							包工头消息
						
						
						
						
						
						
					 | 
					
						2025-02-25 09:53:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd6aa9a945
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-02-24 19:13:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb0d3d0146
					 | 
					
						
						
							
							222
						
						
						
						
						
						
					 | 
					
						2025-02-24 19:12:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4bc3fc406
					 | 
					
						
						
							
							增加消息板块
						
						
						
						
						
						
					 | 
					
						2025-02-24 15:03:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5bfb5fc706
					 | 
					
						
						
							
							增加消息板块
						
						
						
						
						
						
					 | 
					
						2025-02-24 10:18:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15209b7243
					 | 
					
						
						
							
							细节修改
						
						
						
						
						
						
					 | 
					
						2025-02-22 17:41:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e423bf296
					 | 
					
						
						
							
							工资,日报,补卡
						
						
						
						
						
						
					 | 
					
						2025-02-22 17:22:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10db6568fc
					 | 
					
						
						
							
							完成【我的·工资结算记录】板块
						
						
						
						
						
						
					 | 
					
						2025-02-22 16:09:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ee2e24976
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2025-02-22 14:22:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c8c7606703
					 | 
					
						
						
							
							完成工资结算
						
						
						
						
						
						
					 | 
					
						2025-02-22 14:21:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						177b5438df
					 | 
					
						
						
							
							考勤统计
						
						
						
						
						
						
					 | 
					
						2025-02-22 13:42:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						081f1f23d8
					 | 
					
						
						
							
							编写工资结算
						
						
						
						
						
						
					 | 
					
						2025-02-21 16:15:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fa1862e77
					 | 
					
						
						
							
							完成已报名模块、且修正招工中间表类型
						
						
						
						
						
						
					 | 
					
						2025-02-21 11:49:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a56e12ced2
					 | 
					
						
						
							
							考勤统计与工种
						
						
						
						
						
						
					 | 
					
						2025-02-21 09:53:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0fefdd7352
					 | 
					
						
						
							
							完成项目详情及招工申请
						
						
						
						
						
						
					 | 
					
						2025-02-20 19:17:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5c941b452
					 | 
					
						
						
							
							务工者基本信息追加工种
						
						
						
						
						
						
					 | 
					
						2025-02-20 18:30:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67099601a7
					 | 
					
						
						
							
							完成务工者考勤模块
						
						
						
						
						
						
					 | 
					
						2025-02-20 18:22:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						935c804519
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java 
						
						
					 | 
					
						2025-02-20 13:53:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b18a181eca
					 | 
					
						
						
							
							考勤打卡模块
						
						
						
						
						
						
					 | 
					
						2025-02-20 13:52:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d232faad8
					 | 
					
						
						
							
							任务
						
						
						
						
						
						
					 | 
					
						2025-02-20 13:48:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d98028cf78
					 | 
					
						
						
							
							完成日报模块
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:41:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2228f914db
					 | 
					
						
						
							
							任务
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:36:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8c58c1798d
					 | 
					
						
						
							
							完成请假模块
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:33:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f855833966
					 | 
					
						
						
							
							正在编写请假模块
						
						
						
						
						
						
					 | 
					
						2025-02-19 16:10:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10e5eaf242
					 | 
					
						
						
							
							添加字段
						
						
						
						
						
						
					 | 
					
						2025-02-18 17:25:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d782d2d9f0
					 | 
					
						
						
							
							招工列表
						
						
						
						
						
						
					 | 
					
						2025-02-18 16:23:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef59432ca6
					 | 
					
						
						
							
							任务,招工
						
						
						
						
						
						
					 | 
					
						2025-02-18 14:15:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						211b9c5475
					 | 
					
						
						
							
							变更附件获取
						
						
						
						
						
						
					 | 
					
						2025-02-18 14:07:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39ed23e9d4
					 | 
					
						
						
							
							app安全教育完成
						
						
						
						
						
						
					 | 
					
						2025-02-18 11:56:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d01fb0b3c
					 | 
					
						
						
							
							安全教育
						
						
						
						
						
						
					 | 
					
						2025-02-17 18:10:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7af47e35b8
					 | 
					
						
						
							
							实名认证
						
						
						
						
						
						
					 | 
					
						2025-02-17 15:45:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8baee4b858
					 | 
					
						
						
							
							附近增加用户类型
						
						
						
						
						
						
					 | 
					
						2025-02-17 11:56:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c967e9b608
					 | 
					
						
						
							
							登录修改
						
						
						
						
						
						
					 | 
					
						2025-02-17 11:22:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29593068bd
					 | 
					
						
						
							
							登录修改
						
						
						
						
						
						
					 | 
					
						2025-02-17 11:17:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b7156b072
					 | 
					
						
						
							
							务工者追加app的个人基本信息查询
						
						
						
						
						
						
					 | 
					
						2025-02-17 10:44:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						627e3677d9
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2025-02-17 09:53:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						08e242ce85
					 | 
					
						
						
							
							务工者-用户1.0
						
						
						
						
						
						
					 | 
					
						2025-02-17 09:17:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d27512baa4
					 | 
					
						
						
							
							登录
						
						
						
						
						
						
					 | 
					
						2025-02-14 17:54:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |