| 
							
							
								 “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 |  | 
			
				
					| 
							
							
								 “hhk” | 912b404610 | 车辆打标签 | 2024-08-07 16:22:27 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | 5be2781ce1 | Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system | 2024-08-07 16:08:12 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | 8ca8e25bb1 | 企业管理-员工信息 | 2024-08-07 16:08:07 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 199531c95f | 分类字典 | 2024-08-07 16:08:06 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 2cf0b382af | 分类字典 | 2024-08-07 15:54:58 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | 3e73aa8ab9 | Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system | 2024-08-07 15:54:44 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | 95b4242133 | 企业管理-员工信息 | 2024-08-07 15:54:39 +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 |  | 
			
				
					| 
							
							
								 Vinjor | f6b29d08e8 | 积木报表打包问题 | 2024-08-07 11:37:48 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | 93af3ee12e | 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/mapper/CompanyStaffMapper.java
	dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml | 2024-08-07 11:03:55 +08:00 |  | 
			
				
					| 
							
							
								 xiao-fajia | a8224d605e | 企业管理-员工信息 | 2024-08-07 11:02:51 +08:00 |  | 
			
				
					| 
							
							
								 Vinjor | 3f1cb77842 | 解决xml文件扫描不到的bug | 2024-08-07 11:01:30 +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 |  |