Commit Graph

457 Commits

Author SHA1 Message Date
xiaofajia
95f953dcb9 暂提 2024-10-17 17:28:43 +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
Vinjor
fab9fd8e8f Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-16 17:15:14 +08:00
Vinjor
6e1a10507d APP登录 2024-10-16 17:15:07 +08:00
xiaofajia
b6b9395031 审批申请 2024-10-16 15:39:51 +08:00
xiaofajia
95c8fb9491 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-15 22:31:38 +08:00
xiaofajia
2c7868b96a 申请审核 1% 2024-10-15 22:31:30 +08:00
Vinjor
b1ed247602 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-15 18:46:19 +08:00
Vinjor
8c6839c98c 微信小程序分享邀请注册 2024-10-15 18:46:11 +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
b652c329ed Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-15 17:56:15 +08:00
35a2ce8406 救援检测bug修复 2024-10-15 17:56:11 +08:00
Vinjor
42997d7095 订单列表加分页,操作指南对接扣 2024-10-15 15:24:16 +08:00
Vinjor
0a87e55cbe Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-14 18:37:03 +08:00
Vinjor
671ee57cf9 客户信息功能 2024-10-14 18:36:56 +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
dbc65a28a7 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/module/custom/service/impl/UserCarServiceImpl.java
2024-10-12 17:58:24 +08:00
0ef3bbe501 将客户信息授权给某个修理厂service 2024-10-12 17:45:13 +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
PQZ
3b9c113720 1 2024-10-12 13:15:47 +08:00
PQZ
3324eb5b6e 1 2024-10-12 12:50:00 +08:00
PQZ
3002559514 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-12 12:43:01 +08:00
PQZ
ac068a7472 1 2024-10-12 12:42:57 +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
f772f616ac Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-12 12:31:01 +08:00
xiaofajia
96088fcd74 工单指派多选 2024-10-12 12:30:54 +08:00
Vinjor
f71bf1fd74 邀请者 2024-10-12 11:52:01 +08:00
PQZ
5f079d7625 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-11 20:45:36 +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
Vinjor
f1e4b9af3e Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-11 20:45:22 +08:00
PQZ
e0de2462fd 1 2024-10-11 20:45:22 +08:00
Vinjor
0c87ee6793 客户信息 2024-10-11 20:45:13 +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
1ed5310e22 修复检测相关
(cherry picked from commit e1b00b5ac6)
2024-10-11 10:37:23 +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