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 |
|
|
|
977fac06ef
|
支付相关
|
2024-09-26 18:58:50 +08:00 |
|
xiao-fajia
|
83f5436d6d
|
更新代码
|
2024-09-26 18:24:17 +08:00 |
|
PQZ
|
3815b915e3
|
1
|
2024-09-25 22:42:43 +08:00 |
|
PQZ
|
f9cb1259ec
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-25 21:12:34 +08:00 |
|
PQZ
|
ca2b865a11
|
1
|
2024-09-25 21:12:32 +08:00 |
|
|
|
763c6ce174
|
支付相关
|
2024-09-25 20:22:11 +08:00 |
|
xiao-fajia
|
e3188a4c8d
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-25 18:15:17 +08:00 |
|
xiao-fajia
|
ff665a49cf
|
更新代码
|
2024-09-25 18:15:11 +08:00 |
|
PQZ
|
9fd121a1a0
|
1
|
2024-09-25 17:44:20 +08:00 |
|
PQZ
|
1f7788224b
|
1
|
2024-09-25 16:32:06 +08:00 |
|
xiao-fajia
|
8807bd96f4
|
更新代码
|
2024-09-25 08:31:57 +08:00 |
|
xiao-fajia
|
33d9ba5ecc
|
更新代码
|
2024-09-24 20:54:24 +08:00 |
|
|
|
1097aba239
|
支付相关
|
2024-09-23 22:51:44 +08:00 |
|
PQZ
|
2ef8c3ac63
|
1
|
2024-09-23 22:50:10 +08:00 |
|
PQZ
|
3186867fb0
|
1
|
2024-09-23 22:50:05 +08:00 |
|
PQZ
|
4f3179454a
|
1
|
2024-09-23 21:26:18 +08:00 |
|
|
|
e3801e9595
|
支付相关
|
2024-09-23 21:09:03 +08:00 |
|
PQZ
|
feeb5f19b1
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-23 20:27:49 +08:00 |
|
PQZ
|
32f4b4fa64
|
1
|
2024-09-23 20:27:46 +08:00 |
|
xiao-fajia
|
2b821383ff
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-23 18:21:58 +08:00 |
|
xiao-fajia
|
18cf45c52d
|
更新代码
|
2024-09-23 18:21:48 +08:00 |
|
Lihx
|
bf6b379d3e
|
小程序查询客服电话号码接口
|
2024-09-23 18:10:56 +08:00 |
|
PQZ
|
f3ac071e5b
|
1
|
2024-09-23 15:24:09 +08:00 |
|
PQZ
|
dc5f77853e
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-23 14:27:52 +08:00 |
|
PQZ
|
4ac5a3a401
|
1
|
2024-09-23 14:27:49 +08:00 |
|
xiao-fajia
|
0014f3cff5
|
更新代码
|
2024-09-23 12:55:32 +08:00 |
|
xiao-fajia
|
dcf545c3d4
|
更新代码
|
2024-09-23 12:53:32 +08:00 |
|
xiao-fajia
|
72e1635082
|
更新代码
|
2024-09-23 09:00:31 +08:00 |
|
xiao-fajia
|
a4462afdac
|
更新代码
|
2024-09-22 21:38:41 +08:00 |
|
xiao-fajia
|
2174faa20a
|
更新代码
|
2024-09-21 20:43:21 +08:00 |
|
xiao-fajia
|
a80e2acfdb
|
更新代码
|
2024-09-20 21:23:03 +08:00 |
|
xiao-fajia
|
eeafcc14cb
|
更新代码
|
2024-09-20 16:22:24 +08:00 |
|
xiao-fajia
|
5818693230
|
更新代码
|
2024-09-19 19:46:07 +08:00 |
|
xiao-fajia
|
8b91ce834e
|
更新代码
|
2024-09-19 15:26:11 +08:00 |
|
xiao-fajia
|
5da4d8e576
|
更新代码
|
2024-09-18 20:00:50 +08:00 |
|
xiao-fajia
|
20b79ec1ca
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-18 15:05:09 +08:00 |
|
xiao-fajia
|
419406abad
|
更新代码
|
2024-09-18 15:04:54 +08:00 |
|
PQZ
|
14c2aeb980
|
配件库管理
|
2024-09-18 14:12:48 +08:00 |
|
PQZ
|
cbdb65411e
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-18 08:46:18 +08:00 |
|
PQZ
|
c3e1f5baee
|
1
|
2024-09-18 08:46:15 +08:00 |
|
xiao-fajia
|
158254b880
|
更新代码
|
2024-09-14 18:27:29 +08:00 |
|
xiao-fajia
|
3013afb9c7
|
更新代码
|
2024-09-14 14:38:11 +08:00 |
|
xiao-fajia
|
967e66a7da
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-14 11:32:40 +08:00 |
|
xiao-fajia
|
87bbe404ce
|
更新代码
|
2024-09-14 11:32:28 +08:00 |
|
PQZ
|
44feab39e2
|
1
|
2024-09-14 11:31:53 +08:00 |
|
PQZ
|
d6a29cf445
|
Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system
|
2024-09-14 09:37:28 +08:00 |
|
PQZ
|
ba563b20eb
|
1
|
2024-09-14 09:37:25 +08:00 |
|
xiao-fajia
|
825dc1e12d
|
维修业务库init
|
2024-09-13 18:25:51 +08:00 |
|
PQZ
|
a5eef57edb
|
1
|
2024-09-12 18:38:03 +08:00 |
|
PQZ
|
380a7b63bb
|
1
|
2024-09-09 21:17:15 +08:00 |
|
PQZ
|
197440a8bb
|
1
|
2024-09-09 18:28:53 +08:00 |
|
