| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 “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 |  |