Vinjor
|
5142afa7fe
|
1
|
2024-10-23 21:25:26 +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 |
|