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 |
|
许允枞
|
ec5b1a29c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-24 18:06:22 +08:00 |
|
许允枞
|
95a94f0637
|
救援大屏接口
|
2024-10-24 18:05:58 +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 |
|
|
|
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 |
|
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 |
|
许允枞
|
be1e262259
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-23 18:31:03 +08:00 |
|
许允枞
|
b467dfeeb5
|
救援大屏救援订单接口
|
2024-10-23 18:30:38 +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 |
|
|
|
771a4eeadf
|
首页业务处理
|
2024-10-23 15:24:09 +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
|
cca9847107
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-23 14:29:24 +08:00 |
|
xiaofajia
|
acb3262ca2
|
更新代码暂提
|
2024-10-23 14:29:12 +08:00 |
|
许允枞
|
1bf6aa5687
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-23 14:28:25 +08:00 |
|
许允枞
|
c83ebe9acd
|
更新大屏
|
2024-10-23 14:27:58 +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 |
|
PQZ
|
a4f792a0d0
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
# Conflicts:
# dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
|
2024-10-22 18:33:49 +08:00 |
|
PQZ
|
23159d5987
|
1
|
2024-10-22 18:32:46 +08:00 |
|
Vinjor
|
8c22a78224
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-22 18:29:52 +08:00 |
|
Vinjor
|
bc3c0497f4
|
1
|
2024-10-22 18:29:46 +08:00 |
|
许允枞
|
37f28fc2e3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-22 18:11:35 +08:00 |
|
许允枞
|
ffa58ab80c
|
更新大屏
|
2024-10-22 18:11:12 +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 |
|
