Commit Graph

642 Commits

Author SHA1 Message Date
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
bab7f9f22e pagehelp版本升回去 2024-10-12 16:51:13 +08:00
Vinjor
533097151f 微信邀请注册 2024-10-12 16:13:06 +08:00
540c5bba21 修复检测相关 2024-10-12 15:27:58 +08:00
PQZ
3b9c113720 1 2024-10-12 13:15:47 +08:00
Vinjor
73661d454e 解决无法启动问题 2024-10-12 12:57:49 +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
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
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
Vinjor
8030ee5fe3 通用注册登录方法 2024-10-11 10:32:51 +08:00
e1b00b5ac6 修复检测相关 2024-10-11 00:13:16 +08:00
PQZ
3c3956deda Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-10 19:42:52 +08:00
PQZ
3c3bef85b8 1 2024-10-10 19:42:48 +08:00
xiaofajia
b87ddecee6 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-10 16:42:22 +08:00
xiaofajia
26e5fedf4b 信息公告-完善 2024-10-10 16:42:06 +08:00
eebe5ef676 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-10 16:14:54 +08:00
aa1d5a202c 客户设置是否可挂账(后端) 2024-10-10 16:14:50 +08:00
xiaofajia
cc8c9e3ea8 消息提醒 2024-10-10 12:02:32 +08:00
xiaofajia
4d3d3aa971 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-10 11:48:31 +08:00
xiaofajia
9a4ff242d6 消息提醒 2024-10-10 11:48:15 +08:00
c6470ac078 增加是否挂账 2024-10-10 11:29:29 +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
xiaofajia
8fdede5a19 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-10 09:14:34 +08:00
xiaofajia
3ba3c7e42e 消息提醒 2024-10-10 09:14:20 +08:00