Commit Graph

773 Commits

Author SHA1 Message Date
许允枞
035d61cb33 更新 2024-11-15 17:46:37 +08:00
许允枞
4662ae356e 更新 2024-11-14 17:50:14 +08:00
许允枞
5179cbb013 更新 2024-11-14 10:19:16 +08:00
许允枞
fc12805d24 更新 2024-11-13 17:32:00 +08:00
许允枞
95157aa43f 更新 2024-11-13 16:14:32 +08:00
Vinjor
407c7c20c1 1 2024-11-13 15:25:27 +08:00
Vinjor
ab93f86dd2 1 2024-11-13 15:21:00 +08:00
Vinjor
43420aa8b2 1 2024-11-13 14:48:14 +08:00
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
PQZ
11ea2f5ed5 Merge branch 'repair' 2024-11-13 13:44:38 +08:00
许允枞
f627b242a9 更新 2024-11-13 13:03:35 +08:00
PQZ
71cc995aae Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-13 09:49:51 +08:00
PQZ
144c1b7592 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-13 09:49:37 +08:00
PQZ
a23cadaf6a 救援接口 2024-11-13 09:49:34 +08:00
Vinjor
bb70fcb97f 服务顾问不做数据权限控制,他们之间的工单能够互相查看并操作 2024-11-13 09:49:33 +08:00
Vinjor
c179d59cc2 1 2024-11-12 19:14:11 +08:00
Vinjor
5f5f55712a Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 17:51:19 +08:00
Vinjor
9562c149d3 1 2024-11-12 17:51:12 +08:00
许允枞
a46996350d 新增检测项目可以排序 2024-11-12 17:45:16 +08:00
xiaofajia
287c4feab4 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 17:44:25 +08:00
xiaofajia
3c3c173ff6 改配件申请100% 2024-11-12 17:44:06 +08:00
Vinjor
ac25a0cac8 1 2024-11-12 17:36:04 +08:00
许允枞
900ec6e914 订单详情增加显示引车员名称 2024-11-12 17:08:36 +08:00
许允枞
3e431533f1 增加新增工单时选择引车员 2024-11-12 16:39:21 +08:00
Vinjor
26cc95e827 优化查看工单详情速度 2024-11-12 11:24:12 +08:00
许允枞
0278eb6134 修改员工管理 2024-11-12 10:18:28 +08:00
xiaofajia
ed6140bbd9 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 09:48:34 +08:00
xiaofajia
9221a7c503 改配件申请 2024-11-12 09:48:14 +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
Vinjor
abfcc953ea 1
(cherry picked from commit 29939dc277)
2024-11-11 10:32:27 +08:00
0e6aa49c68 检测工人 2024-11-11 10:22:03 +08:00
Vinjor
29939dc277 1 2024-11-11 10:03:13 +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
PQZ
8adf0e01f3 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 15:15:52 +08:00
PQZ
cccf884a2c 1 2024-11-07 15:15:49 +08:00
许允枞
b2682976d5 新增检测项目子表 2024-11-07 14:53:07 +08:00
Vinjor
142daa0baa Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 14:18:49 +08:00
Vinjor
79ad252cb5 1 2024-11-07 14:18:42 +08:00
xiaofajia
fae6ae4882 预约了服务顾问,消息带上 2024-11-07 11:53:08 +08:00