| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 PQZ | db38ccc609 | 客户管理初始化 | 2024-08-01 14:15:40 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | b90448c2d1 | 企业 | 2024-08-01 13:42:31 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 9f707c10b8 | 企业demo | 2024-07-31 21:53:13 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 3826756a86 | 1 | 2024-07-31 20:50:53 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | fcf9455064 | 1 | 2024-07-31 18:52:51 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | bd6cdd958e | demo | 2024-07-31 11:57:47 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 3178d9d7da | 代码包调整 | 2024-07-31 11:23:34 +08:00 |  |