dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
774 Commits 3 Branches 0 Tags 20 MiB
master
Commit Graph

257 Commits

Author SHA1 Message Date
xiao-fajia
8807bd96f4 更新代码 2024-09-25 08:31:57 +08:00
PQZ
20e5f46f7f 1 2024-09-24 22:33:44 +08:00
PQZ
f680a54b5c Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-24 21:32:13 +08:00
PQZ
4d75d2b1ac 1 2024-09-24 21:32:11 +08:00
xiao-fajia
989adaad4b Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-24 20:54:35 +08:00
xiao-fajia
33d9ba5ecc 更新代码 2024-09-24 20:54:24 +08:00
zhaotianfeng
8a2bf03a20 补 2024-09-24 20:05:16 +08:00
zhaotianfeng
753d0f5200 补 2024-09-24 19:54:03 +08:00
zhaotianfeng
3e8925901c Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-24 19:50:34 +08:00
zhaotianfeng
2d111bd7b1 我的车辆 2024-09-24 19:50:08 +08:00
Vinjor
5429922982 账号密码登录 2024-09-24 19:41:52 +08:00
Vinjor
97485e7546 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
 2024-09-24 18:39:58 +08:00
Vinjor
dd0630ad45 微信自动登录 2024-09-24 18:35:51 +08:00
PQZ
0a2d105eb1 1 2024-09-24 18:18:00 +08:00
PQZ
aeae65bc6d 1 2024-09-24 18:05:37 +08:00
PQZ
d04b16a64e Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-24 17:17:25 +08:00
PQZ
4ddb4d34dd 1 2024-09-24 17:17:18 +08:00
zhaotianfeng
a7830b521f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
 2024-09-24 17:11:16 +08:00
zhaotianfeng
14343bb679 我的车辆相关接口 2024-09-24 17:09:22 +08:00
PQZ
d474978d86 111 2024-09-24 17:01:15 +08:00
PQZ
e9b547fbcf 订单管理 2024-09-24 15:12:38 +08:00
PQZ
f39fe1a419 1 2024-09-24 13:30:27 +08:00
13405411873
1097aba239 支付相关 2024-09-23 22:51:44 +08:00
PQZ
3186867fb0 1 2024-09-23 22:50:05 +08:00
PQZ
9143962110 1 2024-09-23 22:06:08 +08:00
PQZ
a6184dfb36 1 2024-09-23 21:55:58 +08:00
PQZ
4f3179454a 1 2024-09-23 21:26:18 +08:00
PQZ
51ffaf71c2 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-23 21:10:03 +08:00
PQZ
6b4dc8cbca 1 2024-09-23 21:10:00 +08:00
13405411873
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
xiao-fajia
424bbab7cc 更新代码 2024-09-23 14:40:54 +08:00
xiao-fajia
a4462afdac 更新代码 2024-09-22 21:38:41 +08:00
PQZ
2d83cf1883 1 2024-09-21 13:59:18 +08:00
PQZ
629b6ad13e 1 2024-09-20 22:59:42 +08:00
PQZ
8ead3de94c 1 2024-09-20 20:39:29 +08:00
PQZ
ca3e41a501 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-20 16:24:25 +08:00
PQZ
7253bfe232 客户会员关系代码初始化 2024-09-20 16:24:21 +08:00
xiao-fajia
684e8e0b5a Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-20 16:22:32 +08:00
xiao-fajia
eeafcc14cb 更新代码 2024-09-20 16:22:24 +08:00
zhaotianfeng
184f74e94b 会员等级展示 2024-09-20 15:59:50 +08:00
zhaotianfeng
2cd0fea776 1、客户关联会员；2、营销活动下加上是否重复参与字段 2024-09-20 15:38:21 +08:00
PQZ
9629957e59 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-19 22:54:17 +08:00
PQZ
05780dd983 会员管理 2024-09-19 22:54:12 +08:00
xiao-fajia
5818693230 更新代码 2024-09-19 19:46:07 +08:00
PQZ
c65ea8d58f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-19 16:14:06 +08:00
PQZ
21203a73ac 会员营销 2024-09-19 16:14:02 +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
825dc1e12d 维修业务库init 2024-09-13 18:25:51 +08:00
PQZ
3516465c9d 供应商管理 2024-09-12 11:09:14 +08:00
PQZ
7ba03242d0 1 2024-09-11 18:34:22 +08:00
PQZ
0c53f3161c 仓库管理 2024-09-10 19:14:18 +08:00
PQZ
f433aff58f 账目分类，服务分类，配件分类 2024-09-10 17:59:02 +08:00
PQZ
8bb0c90b40 1 2024-09-10 15:44:54 +08:00
PQZ
089c04954b 配置类型初始化 2024-09-10 10:55:46 +08:00
nyoung
3adaa2e822 1 2024-09-04 22:34:29 +08:00
nyoung
e2111c6d12 1 2024-09-01 21:13:39 +08:00
nyoung
e188fbd3a2 1 2024-08-31 00:08:49 +08:00
xiao-fajia
7bdc6a79d7 档案管理2 2024-08-28 20:40:01 +08:00
xiao-fajia
a601ee0246 救援APP 2024-08-23 20:41:20 +08:00
xiao-fajia
77f6d157a5 救援APP 2024-08-23 19:56:14 +08:00
xiao-fajia
3d4f5c71ee 救援APP 2024-08-22 15:42:58 +08:00
xiao-fajia
b5c1bffef3 资产管理90% 2024-08-17 20:30:02 +08:00
zhuchunyun
d1952a5754 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
救援
 2024-08-16 13:32:49 +08:00
zhuchunyun
2b28577050 ‘救援’ 2024-08-16 13:32:42 +08:00
xiao-fajia
3783f054a2 资产管理定时通知 2024-08-16 09:43:26 +08:00
xiao-fajia
061989c1ab 资产管理CRUD 2024-08-15 20:17:50 +08:00
xiao-fajia
de5f19d3d2 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-14 20:01:49 +08:00
xiao-fajia
b9e17e0568 员工加角色(查询、交接待完善) 2024-08-14 20:01:43 +08:00
PQZ
b2fd1b596a 调整 2024-08-14 17:48:36 +08:00
PQZ
9ac4b2f05d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-14 16:25:33 +08:00
PQZ
8e2586a0e5 车辆管理相关 2024-08-14 16:25:30 +08:00
xiao-fajia
7c564df4bc 企业管理-员工信息 2024-08-14 13:37:25 +08:00
xiao-fajia
b5d140498f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
 Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
 2024-08-14 11:19:59 +08:00
xiao-fajia
ffafa16367 企业管理-员工信息 2024-08-14 11:18:09 +08:00
Vinjor
40819a9933 sysuser表区分客户还是员工 2024-08-14 10:19:11 +08:00
xiao-fajia
819430bc73 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-13 18:38:37 +08:00
xiao-fajia
603e962aa9 企业管理-员工信息 2024-08-13 18:38:29 +08:00
Vinjor
a0a4789424 创建用户账号和密码的长度限制 2024-08-13 17:17:45 +08:00
PQZ
1f753ffa37 车辆计算内容 2024-08-13 17:00:58 +08:00
xiao-fajia
94db55c584 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
 Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
 2024-08-13 10:42:07 +08:00
xiao-fajia
d6d271edda 企业管理-员工信息 2024-08-13 10:40:22 +08:00
Vinjor
b63feb962c 资产挪包 2024-08-12 15:32:19 +08:00
Vinjor
b784d739bc 数据权限 2024-08-12 15:08:07 +08:00
“hhk”
4d3d510a7f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-12 11:28:40 +08:00
“hhk”
61f37fb637 功能完善 2024-08-12 11:27:40 +08:00
PQZ
c322cfb0ba Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-09 09:11:49 +08:00
xiao-fajia
5653726bd2 企业管理-员工信息 2024-08-09 09:09:10 +08:00
PQZ
bfe3cb2f5f Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
 2024-08-09 08:19:15 +08:00
PQZ
cb687ee417 调整 2024-08-09 08:16:30 +08:00
xiao-fajia
7be21f71f3 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-08 20:20:33 +08:00
xiao-fajia
3d4d5d1c2a 企业管理-员工信息 2024-08-08 20:20:27 +08:00
“hhk”
6654ff1bf1 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-08 20:11:26 +08:00
“hhk”
3ade6b2f3b 资产管理初始化 2024-08-08 20:11:22 +08:00
PQZ
9094191311 合同模板 2024-08-08 17:33:24 +08:00
PQZ
070321be8d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-08 11:41:09 +08:00
PQZ
a165906290 1 2024-08-08 11:40:58 +08:00
“hhk”
6e2fb4d874 车辆品牌型号优化;注释补充 2024-08-08 10:56:21 +08:00
PQZ
4ed7438318 1 2024-08-08 10:09:35 +08:00
PQZ
7d54a42b35 调整 2024-08-07 19:53:08 +08:00
“hhk”
03db497bfe 品牌型号选择器 2024-08-07 18:01:16 +08:00
“hhk”
b58f2a9d67 车辆打标签 2024-08-07 16:23:29 +08:00
“hhk”
6923ae4b2d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-07 16:22:34 +08:00
“hhk”
912b404610 车辆打标签 2024-08-07 16:22:27 +08:00
PQZ
9e22d80d32 标签分类 2024-08-07 15:52:15 +08:00
PQZ
8d29ed67ca 调整 2024-08-07 15:28:20 +08:00
PQZ
743f529c31 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-07 12:00:52 +08:00
PQZ
0b05d6399b 调整 2024-08-07 12:00:49 +08:00
xiao-fajia
21505d1dee Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-07 10:00:08 +08:00
xiao-fajia
c37638b020 企业管理-员工信息 2024-08-07 09:59:56 +08:00
PQZ
7ad0321545 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainSaveReqVO.java
 2024-08-06 17:18:40 +08:00
PQZ
c5e357a16c 调整 2024-08-06 17:12:51 +08:00
“hhk”
ffc02c97fc 车辆页面绑定客户可用；调优 2024-08-06 17:00:24 +08:00
“hhk”
1fcd8308a9 新增车辆品牌维护;车辆基础信息管理优化 2024-08-05 18:51:33 +08:00
PQZ
9fd489d5a5 调整 2024-08-04 20:35:46 +08:00
Vinjor
17e1c168eb 企业资质管理 2024-08-04 16:55:48 +08:00
PQZ
55716462b9 调整 2024-08-04 15:35:08 +08:00
PQZ
767e6d9139 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-04 12:12:23 +08:00
PQZ
d28e02f8c8 调整 2024-08-04 12:12:20 +08:00
Vinjor
e5ceccac02 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-04 11:44:17 +08:00
Vinjor
11d9bc7d37 企业资质 2024-08-04 11:44:15 +08:00
PQZ
e5e48c7f2c 调整 2024-08-04 10:43:34 +08:00
PQZ
38422ce5c2 绑定车辆 2024-08-03 21:51:22 +08:00
PQZ
7eaeb811eb Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-03 18:38:46 +08:00
PQZ
f002019e32 调整 2024-08-03 18:38:43 +08:00
Vinjor
caa9e5308d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-03 17:59:23 +08:00
Vinjor
287dc7a8ec 企业管理完成 2024-08-03 17:59:07 +08:00
PQZ
893e93563d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/CarMainMapper.java
 2024-08-03 16:17:27 +08:00
PQZ
a2c3f20553 绑定车辆 2024-08-03 16:16:37 +08:00
“hhk”
30eafec000 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerMainService.java
 2024-08-02 18:31:45 +08:00
“hhk”
f59371ae53 车辆信息管理功能可用 2024-08-02 18:31:12 +08:00
PQZ
e0c71caa88 调整 2024-08-02 18:18:40 +08:00
PQZ
7b1eada5f1 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-02 12:32:09 +08:00
PQZ
20ad863afd 1 2024-08-02 12:32:05 +08:00
Vinjor
20ad22237f 服务套餐管理功能 2024-08-02 11:57:42 +08:00
PQZ
ffbce36c30 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-02 09:56:20 +08:00
PQZ
e885ad0333 客户管理关联表、扩展表后端代码初始化 2024-08-02 09:56:17 +08:00
Vinjor
8448adeee5 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-01 18:04:45 +08:00
Vinjor
73740982f0 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerMainService.java
#	yudao-server/src/main/resources/application-local.yaml
 2024-08-01 18:04:35 +08:00
PQZ
7e16e197ac 调整 2024-08-01 18:03:12 +08:00
Vinjor
62d5cdff1c 新建租户自动创建租户顶级部门，更新租户自动更新顶级部门名称，登录页根据后缀tenantCode值自动获取登录租户 2024-08-01 18:02:07 +08:00
PQZ
cdbc9919f3 Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-01 17:25:26 +08:00
“hhk”
92e6cac8a1 车辆管理初始化漏提 2024-08-01 17:24:54 +08:00
“hhk”
387de8d1c6 车辆管理初始化 2024-08-01 17:24:41 +08:00
PQZ
a9fe1187de 客户管理 2024-08-01 17:23:57 +08:00