| 
							
							
								 xiaofajia | 56f84995cc | Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java | 2024-11-05 10:38:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 3f45d05344 | 修改重新派工逻辑 | 2024-11-05 10:37:01 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | f8544d6569 | Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair | 2024-11-04 18:44:22 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | d1715c2c2b | 1 | 2024-11-04 18:44:19 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 2dde810dec | 1 | 2024-11-04 18:43:25 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 36e140f7f1 | Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair | 2024-11-04 18:11:01 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | b7163b6aea | 1 | 2024-11-04 18:10:46 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 538067d7e0 | 更新检测相关功能 | 2024-11-04 18:05:07 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 38395104a8 | 员工确认领料、退料时,记录名称和数量 | 2024-11-04 17:19:40 +08:00 |  | 
			
				
					|  | 768c09b0e4 | 维修流程 | 2024-11-04 16:48:31 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | ab35fd68c2 | 修改工单完成状态的更新位置 | 2024-11-04 16:16:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 6a761fb4b3 | 修改员工确认领料、退料 | 2024-11-04 15:21:54 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | a2fbf98de6 | 更新检测相关功能 | 2024-11-04 15:07:18 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4436bb236f | Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair | 2024-11-04 14:54:51 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 3c56602e18 | 1 | 2024-11-04 14:53:43 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | adba8c0dce | 作废工单修改2 | 2024-11-04 14:18:29 +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 |  | 
			
				
					| 
							
							
								 xiaofajia | e4279f87c5 | 修改删除工单 | 2024-11-04 11:03:01 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | fa5076bcab | 修改作废工单 | 2024-11-04 11:00:59 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 1dd68ef79c | 更新检测相关功能 | 2024-11-04 10:33:14 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 91dfdba9e6 | 更新检测相关功能 | 2024-11-04 09:50:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d17b1129a0 | bug修复 (cherry picked from commit 05696bff5e) | 2024-11-02 18:10:35 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b463144cac | 编辑工单和删除工单 (cherry picked from commit 4a90687814) | 2024-11-02 18:09:25 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | bb93d842ec | bug修复 (cherry picked from commit 6b4ec9c046) | 2024-11-02 18:06:11 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 327bc236c5 | 更新检测相关功能 | 2024-11-02 18:04:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | d3b94ada16 | Merge remote-tracking branch 'origin/dev' into dev | 2024-11-02 17:10:07 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 2e3c202b73 | 检测相关功能 | 2024-11-02 17:09:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 05696bff5e | bug修复 | 2024-11-02 16:52:31 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 6b4ec9c046 | bug修复 | 2024-11-02 16:41:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4a90687814 | 编辑工单和删除工单 | 2024-11-01 20:21:58 +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 |  | 
			
				
					| 
							
							
								 Vinjor | f4fe1d3fa3 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-31 18:50:01 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | b03f5c4663 | 1 | 2024-10-31 18:49:54 +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 |  | 
			
				
					|  | d9dfac5d4c | Merge branch 'master' into dev | 2024-10-31 17:58:58 +08:00 |  | 
			
				
					|  | 833824c4a1 | try catch 处理 | 2024-10-31 17:58:08 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | c4d996a265 | 解决维修开单新增客户、车辆信息ID不回填 | 2024-10-31 14:35:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | c939fbe59b | 新增员工角色权限非空判断 | 2024-10-31 10:53:00 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 3c1b2355db | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-30 20:38:09 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 907f86ba52 | 新增服务顾问修改配件售价 | 2024-10-30 20:37:57 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 9a2913f77b | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-30 20:04:54 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | e590c3921c | 1 | 2024-10-30 20:04:51 +08:00 |  |