| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 xiaofajia | e4279f87c5 | 修改删除工单 | 2024-11-04 11:03:01 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | fa5076bcab | 修改作废工单 | 2024-11-04 11:00:59 +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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Vinjor | b03f5c4663 | 1 | 2024-10-31 18:49:54 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | c4d996a265 | 解决维修开单新增客户、车辆信息ID不回填 | 2024-10-31 14:35:05 +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 |  | 
			
				
					| 
							
							
								 xiaofajia | fd3b9c0aec | 打印工单 完成 | 2024-10-30 18:07:27 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | c1cf26a98c | 打印工单 | 2024-10-30 17:48:27 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 85c0f41442 | 打印工单 | 2024-10-30 17:41:42 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | a93e59e5c6 | 打印工单 | 2024-10-30 17:30:37 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d419653666 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-30 16:14:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 0f51329be6 | 打印工单 | 2024-10-30 16:13:55 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | c891ef584c | 1 | 2024-10-30 15:37:40 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | db87951161 | 打印工单 | 2024-10-30 11:26:27 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 138c709c9a | 打印工单 | 2024-10-29 21:30:39 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4c35c69ad7 | 打印工单 | 2024-10-29 16:21:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b458fc1b7b | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-28 23:09:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4165f0912f | 打印工单1/2 | 2024-10-28 23:09:02 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 5625589976 | 修改查询配件接口,增加仓管可以查看待审核 | 2024-10-28 18:03:32 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | cac8ac030f | 增加创建工单时上传用户签名 | 2024-10-28 16:46:15 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 814ad0fde4 | 入库单查询sql修改 | 2024-10-28 11:38:00 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 6a03253d26 | 1 | 2024-10-27 16:12:09 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 32015dd9db | 补正入库方法,跑通流程 | 2024-10-26 21:31:57 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 8f548f45be | 维修工单新增客户处更新 | 2024-10-26 20:55:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | e8b1e7a655 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-26 17:52:48 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | dc6a6e1bc4 | 超时自动总检 | 2024-10-26 17:52:36 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 65410b9f38 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-26 16:56:23 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 0f54e30320 | 1 | 2024-10-26 16:56:17 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 36fb6992f9 | 修改采购单入库的bug | 2024-10-26 16:32:08 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 60bb0a296a | Merge remote-tracking branch 'origin/dev' into dev | 2024-10-26 16:13:43 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | b5c40faf0a | 修改采购单入库的bug | 2024-10-26 16:13:21 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 24ab2d1b5d | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-26 16:07:40 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | fecc3fc5a1 | 1 | 2024-10-26 16:07:35 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 99c1df8df9 | 修改采购单入库的bug | 2024-10-26 15:54:21 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 76cc2cc0b3 | 1 | 2024-10-26 15:06:10 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d42b25596a | 更新代码 | 2024-10-26 11:42:33 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 83a341e541 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java | 2024-10-26 11:21:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | f4dda63143 | 补正同步申请表数据到工单 | 2024-10-26 11:20:07 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | a40a6f8900 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java | 2024-10-26 11:12:31 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | aba04b4c91 | 调整 | 2024-10-26 11:03:28 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 76226e7f67 | 补正同步申请表数据到工单 | 2024-10-26 10:05:53 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 35e61c5321 | 细节补正 | 2024-10-25 22:14:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 950f014f0f | 维修工单车辆、施工人员、销售人员非空判断 | 2024-10-25 22:13:14 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 13273992ed | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-25 22:04:31 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | a4257f3bd3 | 修改领料、退料逻辑 | 2024-10-25 22:04:18 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 637a1124bb | 1 | 2024-10-25 18:51:32 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 47f55f5ce1 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-25 18:12:22 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 2372219243 | 1 | 2024-10-25 18:12:17 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | e3607bed22 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-25 17:53:31 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 3564d6d99a | 1 | 2024-10-25 17:53:28 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | eb5f52e67d | 总检时,更新配件申请表中领料数量小于申请数量的配件到维修工单子表 | 2024-10-25 17:13:05 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d9af2bee73 | 配件申请单审核时,合并维修工单中已存在的配件 补上驳回通知维修工 | 2024-10-25 16:01:09 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | f1e722d302 | 配件申请单审核时,合并维修工单中已存在的配件 | 2024-10-25 15:51:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b947a96ca8 | 服务顾问设置哪些维修图片可以给客户看 | 2024-10-25 12:05:10 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | dab34eeb2a | 结算工单时同步更新订单的支付类型 | 2024-10-24 22:38:10 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 3134888852 | 合并冲突代码 | 2024-10-24 20:35:55 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 935da0bafc | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-24 20:29:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 9ae8344f10 | 服务顾问通知取车前的完成前的编辑工单 | 2024-10-24 20:27:15 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 3f7e14445a | 1 | 2024-10-24 18:17:26 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 300067ae1f | 1 | 2024-10-24 16:45:04 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 8ed75b1daf | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-24 16:31:15 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | fa45344904 | 1 | 2024-10-24 16:31:10 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 6fe4bd85f8 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-24 15:06:06 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | f53debdba2 | 1 | 2024-10-24 15:04:34 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 8201a54327 | Merge remote-tracking branch 'origin/dev' into dev | 2024-10-23 23:21:25 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d3db4f19ff | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-23 23:19:27 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 43a059c63c | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-23 23:19:06 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 1ad9d2e8d0 | 1 | 2024-10-23 23:19:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 20ebfde19c | 通知客户取车1/2 | 2024-10-23 23:17:46 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | da5e1474da | 1 | 2024-10-23 22:15:51 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | d799589097 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # 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/service/impl/DlTicketWaresServiceImpl.java | 2024-10-23 22:01:06 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 5142afa7fe | 1 | 2024-10-23 21:25:26 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 82cbaaa890 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-23 21:21:13 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 5c8d940ea5 | 更新代码暂提 | 2024-10-23 21:20:58 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | f28590ed0f | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-23 17:59:27 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | a9889e5985 | 1 | 2024-10-23 17:59:24 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | d5beed0206 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java | 2024-10-23 14:33:27 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 77036c32f5 | 1 | 2024-10-23 14:32:38 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | acb3262ca2 | 更新代码暂提 | 2024-10-23 14:29:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 524ebe7f2d | 维修工单及项目生命周期记录完善 | 2024-10-23 11:20:49 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | a46846134d | 维修工单及项目生命周期记录完善 | 2024-10-22 23:54:29 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 9c5c3343d4 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java | 2024-10-22 23:46:16 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4b6734ec2d | 维修工单及项目生命周期记录完善 | 2024-10-22 23:44:20 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | bc3c0497f4 | 1 | 2024-10-22 18:29:46 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | e6cb2ba276 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlTicketWares.java | 2024-10-22 16:37:37 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | cb43c66d43 | 配件 | 2024-10-22 16:37:05 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 1afa95fb46 | Merge remote-tracking branch 'origin/dev' into dev | 2024-10-22 16:16:56 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 44b7a93403 | 维修app创建工单时的bug修复 | 2024-10-22 16:16:41 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 7fab245097 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-22 15:58:03 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 44feda7273 | 配件领退修改最后完善 | 2024-10-22 15:57:53 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 18ead24a73 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-22 15:20:43 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 658c78b15f | 1 | 2024-10-22 15:20:39 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | a7dcde4c65 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-22 10:29:32 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 16a8bc8952 | 配件领退优化 | 2024-10-21 21:37:22 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | b910772e5b | Merge remote-tracking branch 'origin/dev' into dev | 2024-10-21 18:13:22 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 5be75a5c81 | 维修app创建工单时的bug修复 | 2024-10-21 18:12:49 +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 |  | 
			
				
					| 
							
							
								 PQZ | 3bd5ad50a2 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-21 17:03:37 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 2c253b024f | 维修数据大屏统计 | 2024-10-21 17:03:33 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | 8859ec6706 | 维修app创建工单后指定施工人员和销售 | 2024-10-21 13:09:45 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 374a82a78d | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-19 22:56:16 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | a268b43f14 | 配件领退优化1/2 | 2024-10-19 22:56:01 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 78147d7382 | 1 | 2024-10-19 18:09:16 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | a76a198161 | 1111 | 2024-10-19 16:07:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4ad6d6835b | 开始施工-施工中-施工完成 100% | 2024-10-19 11:06:45 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d1c037907b | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-19 09:29:14 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 87de5297d9 | 更新代码 | 2024-10-19 09:29:00 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 345aaa77af | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 23:48:07 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 8fcdb5ef18 | 111 | 2024-10-18 23:48:04 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 2114d2a0cf | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 23:47:27 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 2f566cfeb0 | 1 | 2024-10-18 23:47:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 7f1ff44d0c | 配件是否可见 | 2024-10-18 22:03:16 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 18dc48a103 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 20:05:09 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 7c0085496b | 接单 | 2024-10-18 20:05:04 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | e29a5ec1ef | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java | 2024-10-18 19:56:32 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | fe9b6be1b5 | 1 | 2024-10-18 19:55:18 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 6f8f2b7a3a | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-18 18:11:06 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | d8ca30eb67 | 开始施工、施工过程记录 | 2024-10-18 18:09:04 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 457c896ce8 | 1 | 2024-10-18 17:50:45 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 524a66e6f1 | 1 | 2024-10-18 17:48:29 +08:00 |  | 
			
				
					| 
							
							
								 许允枞 | c6e571e56c | app新建工单流程走通 | 2024-10-18 17:11:58 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | e4d6de291b | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-18 17:00:50 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 764d7eee0d | 1 | 2024-10-18 16:52:30 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | deb05cb0b3 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 16:50:41 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 88e5379ea2 | 111 | 2024-10-18 16:50:38 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | b0df9941d9 | 1 | 2024-10-18 16:37:31 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b83b615d93 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 16:36:17 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | bbcd90f9d5 | 更新代码 | 2024-10-18 16:36:09 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 328c865bb6 | 后端对应 RecordTypeEnum 枚举) | 2024-10-18 16:33:23 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | a789c59169 | 操作类型枚举 | 2024-10-18 16:33:09 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 88dab0293f | 1 | 2024-10-18 16:10:53 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b8b73d9e1c | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 15:32:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | f2c0fbf010 | 更新代码 | 2024-10-18 15:32:05 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | c146d42c8c | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-18 14:41:21 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 6386be7e7d | 维修工单状态枚举 | 2024-10-18 14:41:15 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 99cd47d28e | 退料 | 2024-10-17 23:40:19 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | fd4e95a52c | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-17 17:36:15 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 99846979fd | 1 | 2024-10-17 17:35:29 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 1f4a63a296 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-17 17:28:53 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 95f953dcb9 | 暂提 | 2024-10-17 17:28:43 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | d3783b1de9 | 优化维修判断逻辑 | 2024-10-17 16:18:55 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | d10a19a252 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-17 15:22:54 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | de9eec4689 | 消息语音提醒 | 2024-10-17 15:22:49 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 10ce965e65 | 领料同步扣除库存 | 2024-10-17 12:11:24 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | f4b57db744 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-16 22:39:12 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 51fad285f6 | 仓库处理申请、员工确认领料 | 2024-10-16 22:39:03 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | fc918ff41c | app回显个人信息 | 2024-10-16 18:35:34 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | b6b9395031 | 审批申请 | 2024-10-16 15:39:51 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 2c7868b96a | 申请审核 1% | 2024-10-15 22:31:30 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 70995ffe73 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-15 18:01:21 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 50e59d4e4b | 维修工填写配件申请单、配件是否可见 | 2024-10-15 18:01:11 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 42997d7095 | 订单列表加分页,操作指南对接扣 | 2024-10-15 15:24:16 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 21e12b339c | 维修工接单/维修班组长重新指派 | 2024-10-14 17:24:34 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 316e7cae5a | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2024-10-12 20:01:51 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 4e50de5bfe | 维修工接单/维修班组长重新指派,维修工填写配件申请单 1/2 | 2024-10-12 19:59:20 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | dae440e12f | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-12 17:43:49 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 22418e657d | 1 | 2024-10-12 17:43:46 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 533097151f | 微信邀请注册 | 2024-10-12 16:13:06 +08:00 |  | 
			
				
					|  | b1eb9cfbc4 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-12 12:41:10 +08:00 |  | 
			
				
					|  | b8fa5ad88c | 打印导出工单 | 2024-10-12 12:41:06 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 96088fcd74 | 工单指派多选 | 2024-10-12 12:30:54 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | ed211f91ff | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-11 20:45:25 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | e0de2462fd | 1 | 2024-10-11 20:45:22 +08:00 |  | 
			
				
					| 
							
							
								 Lihx | 5de07b49e6 | 更改IPage分页 | 2024-10-11 18:53:33 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 1aa11cce44 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-11 17:15:36 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | 24b48a181f | 优化部分代码与采购、领料关联配件库 | 2024-10-11 17:15:27 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | ce7393652a | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-11 16:55:08 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | fb27a36be1 | 1 | 2024-10-11 16:55:06 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | d8a2f4b3cb | 客户自动注册并登录通用方法 | 2024-10-11 14:06:17 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 7e450c719a | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-11 14:04:01 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | e55ff5d7f7 | 1 | 2024-10-11 14:03:58 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 274e764e22 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-11 10:32:58 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 8030ee5fe3 | 通用注册登录方法 | 2024-10-11 10:32:51 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 3c3bef85b8 | 1 | 2024-10-10 19:42:48 +08:00 |  | 
			
				
					|  | aa1d5a202c | 客户设置是否可挂账(后端) | 2024-10-10 16:14:50 +08:00 |  | 
			
				
					|  | a2e9b959c9 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-10 09:59:43 +08:00 |  | 
			
				
					|  | de124e1fbc | 新增工人判断及去重 | 2024-10-10 09:59:38 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | dd3957f45b | 1 | 2024-10-09 19:27:55 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 483199f042 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev # Conflicts:
#	数据库设计/蓝安集团一体化平台.pdma.json | 2024-10-09 19:07:07 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | a528c2b5f3 | 1 | 2024-10-09 19:06:00 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | c2cb6324e1 | Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev | 2024-10-09 18:12:48 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | dbd5bc0082 | 数据库结构变化 | 2024-10-09 18:12:38 +08:00 |  | 
			
				
					|  | faf5bb0e72 | 维修记录 | 2024-10-09 17:24:53 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 8d382f03a5 | 维修工人代码初始化 | 2024-10-09 14:28:02 +08:00 |  | 
			
				
					| 
							
							
								 xiaofajia | aa35f53cf7 | 维修工单-客户、车辆信息新增、修改 | 2024-10-08 18:33:48 +08:00 |  | 
			
				
					|  | cf0763fb04 | 修复相关 | 2024-09-29 13:00:56 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 1db874a37f | 1 | 2024-09-27 17:56:54 +08:00 |  | 
			
				
					| 
							
							
								 PQZ | 42239d3990 | 1 | 2024-09-27 17:46:41 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 6d5093345b | 维修自动登录 | 2024-09-27 17:30:24 +08:00 |  |