| 
							
							
								 Vinjor | 3f891bf327 | Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system # Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml | 2024-11-13 14:00:02 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 0d69f824f6 | Revert "更新" This reverts commit f627b242a9. | 2024-11-13 13:53:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | f627b242a9 | 更新 | 2024-11-13 13:03:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | a46996350d | 新增检测项目可以排序 | 2024-11-12 17:45:16 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 900ec6e914 | 订单详情增加显示引车员名称 | 2024-11-12 17:08:36 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 3e431533f1 | 增加新增工单时选择引车员 | 2024-11-12 16:39:21 +08:00 |  | 
			
				
					|  | e687b5515e | 检测工人 | 2024-11-11 18:25:54 +08:00 |  | 
			
				
					|  | a0675bb828 | Merge branch 'dev' # Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml | 2024-11-11 18:19:46 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 3620064c2f | 更新修改检测项目提成 | 2024-11-11 18:06:25 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 1aa4436ce6 | 更新修改检测项目提成 | 2024-11-11 16:31:26 +08:00 |  | 
			
				
					|  | 25987034e1 | 检测工人 (cherry picked from commit 0e6aa49c68) | 2024-11-11 12:46:40 +08:00 |  | 
			
				
					|  | ee30997021 | 检测工人 | 2024-11-11 10:35:46 +08:00 |  | 
			
				
					|  | 0e6aa49c68 | 检测工人 | 2024-11-11 10:22:03 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 8a75e00e26 | 更新 | 2024-11-09 21:23:54 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | fd94f59ee1 | websocket方法调用(检测) | 2024-11-09 10:57:53 +08:00 |  | 
			
				
					|  | 8b74bc9496 | 检测工人声音 | 2024-11-09 09:53:26 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | b623133c22 | 员工提成 | 2024-11-08 17:35:17 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | c55205c535 | 员工提成 | 2024-11-08 13:28:58 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | b6c5d5515b | 增加检测第一步与最后一步需要上传图片 | 2024-11-07 18:03:42 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | b2682976d5 | 新增检测项目子表 | 2024-11-07 14:53:07 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 95bb7a285e | 更新检测相关功能 | 2024-11-06 10:24:14 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | ef1cd46a97 | 更新检测相关功能 | 2024-11-05 18:04:02 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 538067d7e0 | 更新检测相关功能 | 2024-11-04 18:05:07 +08:00 |  | 
			
				
					|  | 768c09b0e4 | 维修流程 | 2024-11-04 16:48:31 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | a2fbf98de6 | 更新检测相关功能 | 2024-11-04 15:07:18 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | aeb9e032e2 | 更新检测相关功能 | 2024-11-04 13:35:07 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 6e23cc2d24 | 更新检测相关功能 | 2024-11-04 13:29:27 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 5343f74839 | 更新检测相关功能 | 2024-11-04 13:26:54 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | bf216df437 | 更新检测相关功能 | 2024-11-04 13:11:51 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 1dd68ef79c | 更新检测相关功能 | 2024-11-04 10:33:14 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 91dfdba9e6 | 更新检测相关功能 | 2024-11-04 09:50:41 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 327bc236c5 | 更新检测相关功能 | 2024-11-02 18:04:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 2e3c202b73 | 检测相关功能 | 2024-11-02 17:09:36 +08:00 |  | 
			
				
					|  | 11c1e759aa | try catch 处理 | 2024-11-01 14:22:57 +08:00 |  | 
			
				
					|  | c2eea55b5d | Merge remote-tracking branch 'origin/master' | 2024-11-01 13:45:11 +08:00 |  | 
			
				
					|  | fcf2f05099 | Revert "try catch 处理" This reverts commit e7bd033a78. | 2024-11-01 13:43:04 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | a83b5985ff | 解决bug | 2024-11-01 09:17:31 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | ceac1b1e0c | 1 | 2024-10-31 19:23:16 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | f3f37bc908 | Merge remote-tracking branch 'origin/dev' into dev | 2024-10-31 18:05:36 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 6be4a8f089 | 更新检测功能,新增可以查看app端当前登录用户可以选择的工单 | 2024-10-31 18:05:02 +08:00 |  | 
			
				
					|  | 833824c4a1 | try catch 处理 | 2024-10-31 17:58:08 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 6583cb87ed | 检测项目新增时增加验证 | 2024-10-30 18:06:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 5736714506 | 新增检测项目管理 | 2024-10-29 18:08:28 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 1dc08ab054 | 新增检测项目管理 | 2024-10-29 18:07:15 +08:00 |  | 
			
				
					|  | e7bd033a78 | try catch 处理 | 2024-10-28 11:30:45 +08:00 |  | 
			
				
					|  | 330dad2bcb | try catch 处理 | 2024-10-28 10:40:30 +08:00 |  | 
			
				
					|  | 2f6341d823 | 救援司机端客户信息同步 | 2024-10-25 18:19:55 +08:00 |  | 
			
				
					|  | 9f05b0b6ba | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-24 13:13:46 +08:00 |  | 
			
				
					|  | 92ba31ac12 | 检测客户信息同步 | 2024-10-24 13:13:41 +08:00 |  | 
			
				
					|  | 7ec5a905c5 | 首页业务处理 | 2024-10-23 23:25:04 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | c83ebe9acd | 更新大屏 | 2024-10-23 14:27:58 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | ffa58ab80c | 更新大屏 | 2024-10-22 18:11:12 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | a1fd86ac6e | Merge branch 'master' into dev # Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java | 2024-10-21 18:03:53 +08:00 |  | 
			
				
					|  | 552545e4c3 | 驾校系统bug修复 | 2024-10-21 11:25:13 +08:00 |  | 
			
				
					|  | d7c1ac245d | 识别代办 | 2024-10-17 17:18:17 +08:00 |  | 
			
				
					|  | 35a2ce8406 | 救援检测bug修复 | 2024-10-15 17:56:11 +08:00 |  | 
			
				
					|  | af1be4cb26 | 修复检测相关 | 2024-10-15 10:34:05 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 0c87ee6793 | 客户信息 | 2024-10-11 20:45:13 +08:00 |  | 
			
				
					| 
							
							
								 Lihx | 5de07b49e6 | 更改IPage分页 | 2024-10-11 18:53:33 +08:00 |  | 
			
				
					|  | 1ed5310e22 | 修复检测相关 (cherry picked from commit e1b00b5ac6) | 2024-10-11 10:37:23 +08:00 |  | 
			
				
					|  | e1b00b5ac6 | 修复检测相关 | 2024-10-11 00:13:16 +08:00 |  | 
			
				
					|  | c436aa8d9d | 修复相关 | 2024-10-01 10:11:34 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | a677056951 | 1 | 2024-09-20 01:20:53 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 971ea9dfb2 | Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system | 2024-09-20 00:43:41 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | f6511ea3b0 | 1 | 2024-09-20 00:43:39 +08:00 |  | 
			
				
					| 
							
							
								 Lihx | f9520fc152 | 替换UserId | 2024-09-20 00:17:38 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 4e5a0d3f63 | 1 | 2024-09-20 00:16:25 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 3b7d69a768 | 1 | 2024-09-19 23:54:35 +08:00 |  | 
			
				
					|  | bd0e7afcf3 | 检测上线 | 2024-09-19 23:05:23 +08:00 |  | 
			
				
					| 
							
							
								 Lihx | 2d97d8f21d | 上线 | 2024-09-19 17:57:05 +08:00 |  | 
			
				
					|  | 882d69f499 | 检测上线 | 2024-09-18 18:48:55 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | 5222132678 | 1 | 2024-09-14 11:51:06 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | 3adaa2e822 | 1 | 2024-09-04 22:34:29 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | e4d1ea9d84 | 1 | 2024-09-03 08:50:49 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | a75b052167 | 1 | 2024-09-02 21:25:04 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | e2111c6d12 | 1 | 2024-09-01 21:13:39 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | e188fbd3a2 | 1 | 2024-08-31 00:08:49 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | 127623bd4c | 检测 | 2024-08-28 21:40:03 +08:00 |  | 
			
				
					| 
							
							
								 nyoung | 3f6026918d | 检测 | 2024-08-28 20:54:03 +08:00 |  |