YunaiV
							
						 
					 | 
					
						
						
							
						
						6a4449e03f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/ureport2' into feature/ureport2
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml 
						
						
					 | 
					
						2023-12-06 21:03:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						076bf13687
					 | 
					
						
						
							
							📈 REPORT:code review ureport2 实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						0d3efe4f80
					 | 
					
						
						
							
							【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5e9cbb9cad
					 | 
					
						
						
							
							report:code review ureport 的集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						9350523b35
					 | 
					
						
						
							
							【新增】ureport2菜单,初始化数据
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						5894d2be01
					 | 
					
						
						
							
							【修改】ureport2 集成的SQL语句,并适配数据库存储方式
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						7c43c3a2b1
					 | 
					
						
						
							
							【新增】ureport2 集成的SQL语句
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						8507fa9172
					 | 
					
						
						
							
							【新增】ureport2 集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9d10c74599
					 | 
					
						
						
							
							📈 REPORT:code review ureport2 实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:00:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5bf7cd396f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2023-12-06 20:28:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9451287264
					 | 
					
						
						
							
							✨ CRM:同步最新功能,基本跑通客户信息的维护
						
						
						
						
						
						
					 | 
					
						2023-12-06 20:28:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								胡桃云
							
						 
					 | 
					
						
						
							
						
						160e3584d3
					 | 
					
						
						
							
							商城-商品库存为零可以展示商品列表
						
						
						
						
						
						
					 | 
					
						2023-12-06 20:27:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9eb4f49b4d
					 | 
					
						
						
							
							!773 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
						
						Merge pull request !773 from souvc/feature/ureport2 
						
						
					 | 
					
						2023-12-06 12:24:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						f333aa38c1
					 | 
					
						
						
							
							!777 商城模块,商品库存为零也可显示商品信息
						
						
						
						
						
						
						
						Merge pull request !777 from 奕泽云/master 
						
						
					 | 
					
						2023-12-06 12:17:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3707662187
					 | 
					
						
						
							
							📈 CRM:code review 数据权限
						
						
						
						
						
						
					 | 
					
						2023-12-06 20:04:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d430063eec
					 | 
					
						
						
							
							Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java 
						
						
					 | 
					
						2023-12-06 19:33:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a36fe8c40e
					 | 
					
						
						
							
							📈 CRM:code review 联系人商机功能
						
						
						
						
						
						
					 | 
					
						2023-12-06 19:26:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						21a3870c00
					 | 
					
						
						
							
							!775 crm联系人商机功能
						
						
						
						
						
						
						
						Merge pull request !775 from zyna/feature/crm 
						
						
					 | 
					
						2023-12-06 05:57:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3678752a61
					 | 
					
						
						
							
							🔨 CRM:优化产品分类代码的实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 12:56:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c94f71a3df
					 | 
					
						
						
							
							🔨 CRM:优化产品分类代码的实现
						
						
						
						
						
						
					 | 
					
						2023-12-06 12:56:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a9b2656971
					 | 
					
						
						
							
							代码生成测试:生成测试文件
						
						
						
						
						
						
					 | 
					
						2023-12-06 00:30:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e0bdc4f4c1
					 | 
					
						
						
							
							代码生成测试:系统不一样生成的文件也有差异,那就各自生成各自。新增根据操作系统动态获取测试文件资源路径
						
						
						
						
						
						
					 | 
					
						2023-12-06 00:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						73e76ab453
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/crm
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java 
						
						
					 | 
					
						2023-12-05 22:42:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a11d5dc5f1
					 | 
					
						
						
							
							🔨 CRM:优化产品代码的实现
						
						
						
						
						
						
					 | 
					
						2023-12-05 22:41:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d59d1428d7
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
						
						
						
						
						
						
					 | 
					
						2023-12-05 22:25:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						c463f831f4
					 | 
					
						
						
							
							!776 【CRM:优化产品以及产品分类】
						
						
						
						
						
						
						
						Merge pull request !776 from ZanGe丶/feature/crm 
						
						
					 | 
					
						2023-12-05 12:15:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9a898a81fd
					 | 
					
						
						
							
							!783 ✅ 增加 system 和 infra 的代码覆盖率,提升稳定性
						
						
						
						
						
						
						
						Merge pull request !783 from 芋道源码/feature/vo-optimize 
						
						
					 | 
					
						2023-12-05 12:08:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c69fbe540a
					 | 
					
						
						
							
							✅ 增加 codegen 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-05 20:00:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						455a4ebc7b
					 | 
					
						
						
							
							CRM-客户:实现数据权限、场景检索和公海数据分页查询
						
						
						
						
						
						
					 | 
					
						2023-12-05 15:04:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						78165f2161
					 | 
					
						
						
							
							CRM: 新增 CRM 分页查询工具类,实现通用构造 crm 数据类型数据分页查询条件
						
						
						
						
						
						
					 | 
					
						2023-12-05 15:03:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b2621c8891
					 | 
					
						
						
							
							CRM-客户: 新增关注和取消关注客户接口
						
						
						
						
						
						
					 | 
					
						2023-12-05 11:04:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9c1687dc25
					 | 
					
						
						
							
							CRM: 新增关注数据模块
						
						
						
						
						
						
					 | 
					
						2023-12-05 11:00:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a62399fbca
					 | 
					
						
						
							
							✅ 增加 infra logger 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-04 20:43:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						da829f7cf5
					 | 
					
						
						
							
							✅ 增加 sms/tenant/senstiveword 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-04 13:14:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c2e9ecf7be
					 | 
					
						
						
							
							✅ 增加 social 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-04 09:54:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								胡桃云
							
						 
					 | 
					
						
						
							
						
						6f237a10b5
					 | 
					
						
						
							
							商城-商品库存为零可以展示商品列表
						
						
						
						
						
						
					 | 
					
						2023-12-03 23:08:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f656888965
					 | 
					
						
						
							
							✅ 增加 permission 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-03 21:55:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ZanGe丶
							
						 
					 | 
					
						
						
							
						
						d2e965fb02
					 | 
					
						
						
							
							【CRM:优化产品以及产品分类】
						
						
						
						
						
						
					 | 
					
						2023-12-03 21:33:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4dab6d0217
					 | 
					
						
						
							
							✅ 增加 dept 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-03 21:26:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dab751dc74
					 | 
					
						
						
							
							✅ 增加 dict 模块的单测覆盖率
						
						
						
						
						
						
					 | 
					
						2023-12-03 21:15:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zyna
							
						 
					 | 
					
						
						
							
						
						910bc09e19
					 | 
					
						
						
							
							crm联系人商机功能
						
						
						
						
						
						
					 | 
					
						2023-12-03 20:01:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						319c73feaf
					 | 
					
						
						
							
							🐛 修复微信小程序的一键登录时,缺少 state 参数
						
						
						
						
						
						
					 | 
					
						2023-12-03 19:15:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						47b77d7360
					 | 
					
						
						
							
							!774  简化 system 和 infra 大模块模块的 VO
						
						
						
						
						
						
						
						Merge pull request !774 from 芋道源码/feature/vo-optimize 
						
						
					 | 
					
						2023-12-03 10:58:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						30fef09eee
					 | 
					
						
						
							
							🔧 简化 errorLog 和 accessLog 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 18:32:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e541fe6324
					 | 
					
						
						
							
							🔧 简化 job 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 18:11:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						c7386d9e04
					 | 
					
						
						
							
							【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
					 | 
					
						2023-12-03 17:25:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						35d171b1d9
					 | 
					
						
						
							
							🔧 简化 file 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 10:33:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc3bb430c3
					 | 
					
						
						
							
							🔧 简化 dataSourceConfig 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 10:06:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						645e6f3cc8
					 | 
					
						
						
							
							🔧 简化 config 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 09:57:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						42dc4b6194
					 | 
					
						
						
							
							🔧 简化 user 模块的 VO
						
						
						
						
						
						
					 | 
					
						2023-12-03 01:02:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |