luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								c5f5f1df97
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-19 14:29:35 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								7656519f5b
								
							
						 | 
						
							
							
								
								代码提交
							
							
							
							
							
						 | 
						
							2024-12-19 14:29:26 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								b498335108
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-19 14:16:18 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								bbec0065eb
								
							
						 | 
						
							
							
								
								小程序保安录入增加新字段
							
							
							
							
							
						 | 
						
							2024-12-19 14:15:46 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								b086e5a49f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-19 14:15:42 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								078d4f5606
								
							
						 | 
						
							
							
								
								feat(service): 新增单位下安保人员花名册功能并添加文化程度字段
							
							
							
							
							
							
							
							- 新增 EducationLevel 枚举类,用于表示不同的教育水平
- 在 SecurityUser 和相关 DTO 中添加 educationLevel 字段
- 新增 unitSecurityUserRoster 接口和实现方法- 更新数据库查询以包含新的教育水平字段 
							
						 | 
						
							2024-12-19 14:15:31 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								144bca851a
								
							
						 | 
						
							
							
								
								名字修复
							
							
							
							
							
						 | 
						
							2024-12-19 11:55:00 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								0d858a3455
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-12-19 11:48:20 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								ee21484501
								
							
						 | 
						
							
							
								
								Update publicUnit.vue
							
							
							
							
							
						 | 
						
							2024-12-19 11:48:17 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								79b50df5ac
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-19 10:13:50 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								d8d1a7db13
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2024-12-19 10:11:16 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								875bfbd236
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-12-19 10:01:14 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								ffddb4dd45
								
							
						 | 
						
							
							
								
								新增  文化程度
							
							
							
							
							
						 | 
						
							2024-12-19 10:01:12 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								849ae8593c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-19 09:24:23 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								f525f578d2
								
							
						 | 
						
							
							
								
								取消手机号限制
							
							
							
							
							
						 | 
						
							2024-12-19 09:23:48 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								5b33b5fbd2
								
							
						 | 
						
							
							
								
								Update publicUnit.vue
							
							
							
							
							
						 | 
						
							2024-12-19 09:19:38 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								18c14241cb
								
							
						 | 
						
							
							
								
								。。
							
							
							
							
							
						 | 
						
							2024-12-18 19:10:35 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								895c0c8c62
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-12-18 10:06:41 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								72f00973f2
								
							
						 | 
						
							
							
								
								Update .DS_Store
							
							
							
							
							
						 | 
						
							2024-12-18 10:06:39 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								61d1426d8d
								
							
						 | 
						
							
							
								
								代码提交
							
							
							
							
							
						 | 
						
							2024-12-11 11:42:36 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								fa0235885a
								
							
						 | 
						
							
							
								
								代码提交
							
							
							
							
							
						 | 
						
							2024-12-11 11:41:39 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								ddf9f52df8
								
							
						 | 
						
							
							
								
								代码提交
							
							
							
							
							
						 | 
						
							2024-12-11 11:41:11 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								ddc0a7362e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-11 11:27:26 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								be4e84919b
								
							
						 | 
						
							
							
								
								refactor(login): 更新登录页面应用名称
							
							
							
							
							
							
							
							- 将静态文本"超级后台"替换为动态显示的 appInfo.appName
- 在登录页面的标题和 logo 文本中使用动态应用名称
- 引入 __APP_INFO 常量以获取应用信息 
							
						 | 
						
							2024-12-11 11:27:16 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								b4a2ea1c45
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-12-03 16:56:36 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								6a481c205f
								
							
						 | 
						
							
							
								
								Fix  Bug
							
							
							
							
							
						 | 
						
							2024-12-03 16:56:34 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								5ebc6c9b84
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-03 11:17:07 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								35e2a3b94d
								
							
						 | 
						
							
							
								
								修改行政区划
							
							
							
							
							
						 | 
						
							2024-12-03 11:16:47 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								93818ca9bf
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-12-02 16:16:09 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								400de9fbc5
								
							
						 | 
						
							
							
								
								注释打印
							
							
							
							
							
						 | 
						
							2024-12-02 16:16:06 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								801b770f4f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-02 16:09:34 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								6d0c45931b
								
							
						 | 
						
							
							
								
								小程序接入保安证号接口
							
							
							
							
							
						 | 
						
							2024-12-02 16:09:25 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								83ea6fa001
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-12-02 15:19:33 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								5df4d70211
								
							
						 | 
						
							
							
								
								代码提交
							
							
							
							
							
						 | 
						
							2024-12-02 15:19:20 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								90202e7e95
								
							
						 | 
						
							
							
								
								小程序接入保安证号接口
							
							
							
							
							
						 | 
						
							2024-12-02 13:48:51 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								c339455817
								
							
						 | 
						
							
							
								
								Update securityUserForm.vue
							
							
							
							
							
						 | 
						
							2024-12-02 10:55:07 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								e08ba079fe
								
							
						 | 
						
							
							
								
								小程序接入保安证号接口
							
							
							
							
							
						 | 
						
							2024-12-02 10:19:58 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								f80ef7bc85
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	collect_information/.env.development 
							
						 | 
						
							2024-12-02 10:18:26 +08:00 | 
						
					
				
					
						
							
							
								
								 wangyilin
							
						 | 
						
							
							
							
							
							
								
							
							
								81d0d1e9f4
								
							
						 | 
						
							
							
								
								小程序接入保安证号接口
							
							
							
							
							
						 | 
						
							2024-12-02 10:17:58 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc1464f9c
								
							
						 | 
						
							
							
								
								自测 完善
							
							
							
							
							
						 | 
						
							2024-12-02 10:17:32 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								74a97da1ff
								
							
						 | 
						
							
							
								
								Update publicUnit.vue
							
							
							
							
							
							
							
							修复删除不刷新bug 
							
						 | 
						
							2024-11-29 17:38:02 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								edff88dd0c
								
							
						 | 
						
							
							
								
								Update publicUnit.vue
							
							
							
							
							
						 | 
						
							2024-11-29 17:09:34 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								59b58cf6f7
								
							
						 | 
						
							
							
								
								初步完成 公安后台 保安人员 头像上传 待复测
							
							
							
							
							
						 | 
						
							2024-11-29 16:39:30 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								87c9c7b053
								
							
						 | 
						
							
							
								
								搜索保安证件号
							
							
							
							
							
						 | 
						
							2024-11-29 15:37:53 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								c88984537e
								
							
						 | 
						
							
							
								
								Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity
							
							
							
							
							
						 | 
						
							2024-11-29 14:10:20 +08:00 | 
						
					
				
					
						
							
							
								
								 TimSpan
							
						 | 
						
							
							
							
							
							
								
							
							
								918b6b5468
								
							
						 | 
						
							
							
								
								初步完成人员 人员录入的增删改
							
							
							
							
							
						 | 
						
							2024-11-29 14:10:18 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								f88e3b9709
								
							
						 | 
						
							
							
								
								refactor(task): 优化查询 Security 关联信息接口请求
							
							
							
							
							
							
							
							-将 token 参数从请求头移至 URL 中
- 简化了请求构建过程,提高了代码可读性 
							
						 | 
						
							2024-11-28 17:22:57 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								2e210d5435
								
							
						 | 
						
							
							
								
								feat(task): 添加 token 续期日志输出
							
							
							
							
							
							
							
							- 在 SecurityAssociationDockingServiceTask 类中,续期 token 后增加日志输出
- 通过 log.info 方法打印续期后的 token 信息 
							
						 | 
						
							2024-11-28 17:12:52 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								5714f68ed8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2024-11-28 16:01:08 +08:00 | 
						
					
				
					
						
							
							
								
								 luozhun
							
						 | 
						
							
							
							
							
							
								
							
							
								f5f9212a88
								
							
						 | 
						
							
							
								
								feat(module): 新增公安后台企事业单位功能
							
							
							
							
							
							
							
							- 新增企事业单位下服务项目列表接口
- 实现服务项目新增、编辑和删除功能
- 添加保安人员新增、编辑和删除功能
-集成保安协会接口,实现身份证查询保安证功能
- 优化单位和用户选择接口 
							
						 | 
						
							2024-11-28 16:00:50 +08:00 |