Commit Graph

711 Commits

Author SHA1 Message Date
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
f6bc245454 员工加角色完成 2024-08-15 08:58:31 +08:00
xiao-fajia
3addbe0b9b 员工加角色修正 2024-08-14 20:31:15 +08:00
xiao-fajia
f0206a1cb2 员工加角色(查询、交接待完善) 2024-08-14 20:12:00 +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
Vinjor
1b42f4e3ad 资产存放位置完成 2024-08-14 17:50:49 +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
Vinjor
dc74f8f0b0 资产存放位置 2024-08-14 14:34:10 +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
愉快的大福
58f3d3d4a3 知识模块 2024-08-12 21:27:02 +08:00
愉快的大福
da3f99f79c 知识模块 2024-08-12 18:49:48 +08:00
Vinjor
b63feb962c 资产挪包 2024-08-12 15:32:19 +08:00
Vinjor
b784d739bc 数据权限 2024-08-12 15:08:07 +08:00
愉快的大福
be4810d4c8 知识模块 2024-08-12 15:04:39 +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”
ca0cc34b3d Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-08-07 18:01:19 +08:00
“hhk”
03db497bfe 品牌型号选择器 2024-08-07 18:01:16 +08:00
Vinjor
7e263447be 部门添加祖级列表字段 2024-08-07 16:40:54 +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