YunaiV
							
						 | 
						
							
							
							
							
								
							
								d991d92cfc
								
							
								
							
						 | 
						
							
							
								
								📖 CRM:【客户配置】调整目录结构
							
							
							
							
							
							
							
							(cherry picked from commit d71097ac31) 
							
						 | 
						
							2024-03-08 21:04:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								26faf5bdfd
								
							
								
							
						 | 
						
							
							
								
								📖 CRM:【客户】微调客户列表界面
							
							
							
							
							
							
							
							(cherry picked from commit 4fbb3b88e6) 
							
						 | 
						
							2024-03-08 21:04:08 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								6de158bb54
								
							
								
							
						 | 
						
							
							
								
								📖 CRM:【客户】微调客户列表界面
							
							
							
							
							
							
							
							(cherry picked from commit 7448f6e08c) 
							
						 | 
						
							2024-03-08 21:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								08a6ecefb1
								
							
								
							
						 | 
						
							
							
								
								📖 CRM:code review 商机模块
							
							
							
							
							
							
							
							(cherry picked from commit 0a4023ef00) 
							
						 | 
						
							2024-03-08 21:03:55 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								6fe6e51b2f
								
							
								
							
						 | 
						
							
							
								
								📖 操作日志的界面实现
							
							
							
							
							
							
							
							(cherry picked from commit 1eefa02c4c) 
							
						 | 
						
							2024-03-08 21:03:11 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								e2359633dd
								
							
								
							
						 | 
						
							
							
								
								fix: 修复请假申请提交后页面不返回的bug
							
							
							
							
							
						 | 
						
							2024-03-08 21:00:35 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								ce62ded6b6
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 Excel 导出失败时,依然下载的问题
							
							
							
							
							
							
							
							(cherry picked from commit ccb997ac2a) 
							
						 | 
						
							2024-03-08 20:54:22 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								c124ca4879
								
							
								
							
						 | 
						
							
							
								
								fix: 修复文件上传数据回显错误
							
							
							
							
							
							
							
							(cherry picked from commit aadad39a69) 
							
						 | 
						
							2024-03-08 20:54:03 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								2b1c12eb4b
								
							
								
							
						 | 
						
							
							
								
								crm-客户:集成操作日志详情组件
							
							
							
							
							
							
							
							(cherry picked from commit 261d8b2aa4) 
							
						 | 
						
							2024-03-08 20:53:54 +08:00 | 
						
					
				
					
						
							
							
								 
								落日晚风
							
						 | 
						
							
							
							
							
								
							
								62b9002cf6
								
							
								
							
						 | 
						
							
							
								
								满减送数据对接
							
							
							
							
							
							
							
							(cherry picked from commit 21e8dbf985) 
							
						 | 
						
							2024-03-08 20:53:30 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b890915539
								
							
								
							
						 | 
						
							
							
								
								📖 code review:店铺装修逻辑
							
							
							
							
							
							
							
							(cherry picked from commit 9591ed7084) 
							
						 | 
						
							2024-03-08 20:53:04 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								c57db2bf09
								
							
								
							
						 | 
						
							
							
								
								📖 code review:店铺装修逻辑
							
							
							
							
							
							
							
							(cherry picked from commit b86f082306) 
							
						 | 
						
							2024-03-08 20:52:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zyna
							
						 | 
						
							
							
							
							
								
							
								b22e361eaa
								
							
								
							
						 | 
						
							
							
								
								crm联系人商机修改
							
							
							
							
							
							
							
							(cherry picked from commit 2cfe006def) 
							
						 | 
						
							2024-03-08 20:52:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zyna
							
						 | 
						
							
							
							
							
								
							
								d6c56f8588
								
							
								
							
						 | 
						
							
							
								
								crm联系人商机修改
							
							
							
							
							
							
							
							(cherry picked from commit dd4482fad2) 
							
						 | 
						
							2024-03-08 20:52:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zyna
							
						 | 
						
							
							
							
							
								
							
								d6a4795ca4
								
							
								
							
						 | 
						
							
							
								
								crm联系人商机修改
							
							
							
							
							
							
							
							(cherry picked from commit a1fd3afc32) 
							
						 | 
						
							2024-03-08 20:52:47 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								cae1d7cb1a
								
							
								
							
						 | 
						
							
							
								
								统计:增加商品统计
							
							
							
							
							
							
							
							(cherry picked from commit ca35e1a4af) 
							
						 | 
						
							2024-03-08 20:52:15 +08:00 | 
						
					
				
					
						
							
							
								 
								水人
							
						 | 
						
							
							
							
							
								
							
								96fae4f3ea
								
							
								
							
						 | 
						
							
							
								
								update src/api/bpm/task/index.ts.
							
							
							
							
							
							
							
							后台接口地址是return-list,前台写成了get-return-list
Signed-off-by: 水人 <417693680@qq.com>
(cherry picked from commit 346863a8a9) 
							
						 | 
						
							2024-03-08 20:51:45 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								f07b7dbbb0
								
							
								
							
						 | 
						
							
							
								
								营销:优化商城装修组件
							
							
							
							
							
							
							
							(cherry picked from commit 80355f3acd) 
							
						 | 
						
							2024-03-08 20:51:29 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								6a7c04db5e
								
							
								
							
						 | 
						
							
							
								
								营销:适配商城装修组件【标题栏】
							
							
							
							
							
							
							
							(cherry picked from commit 33162a12c0) 
							
						 | 
						
							2024-03-08 20:51:24 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								67b24d61b6
								
							
								
							
						 | 
						
							
							
								
								营销:适配商城装修组件【热区】
							
							
							
							
							
							
							
							(cherry picked from commit 41a404a52c) 
							
						 | 
						
							2024-03-08 20:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								5ab56e3fff
								
							
								
							
						 | 
						
							
							
								
								crm-客户:集成操作日志详情组件
							
							
							
							
							
							
							
							(cherry picked from commit 455688eaa8) 
							
						 | 
						
							2024-03-08 20:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								f9c272ad0d
								
							
								
							
						 | 
						
							
							
								
								feat:新增公共操作日志详情组件
							
							
							
							
							
							
							
							(cherry picked from commit 59c6670775) 
							
						 | 
						
							2024-03-08 20:50:45 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								156e7ccb53
								
							
								
							
						 | 
						
							
							
								
								营销:适配商城装修组件【悬浮按钮】
							
							
							
							
							
							
							
							(cherry picked from commit edfdee8cc1) 
							
						 | 
						
							2024-03-08 20:48:47 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								5d527672a1
								
							
								
							
						 | 
						
							
							
								
								营销:适配商城装修组件【弹窗广告】
							
							
							
							
							
							
							
							(cherry picked from commit 76025b6821) 
							
						 | 
						
							2024-03-08 20:48:35 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								91db4949d5
								
							
								
							
						 | 
						
							
							
								
								封装拖拽组件,提供移动、新增、删除功能
							
							
							
							
							
							
							
							(cherry picked from commit 59ff6b13fb) 
							
						 | 
						
							2024-03-08 20:48:27 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								f0f75fac0c
								
							
								
							
						 | 
						
							
							
								
								BUG
							
							
							
							
							
						 | 
						
							2024-03-08 20:45:43 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								d1cfe78283
								
							
								
							
						 | 
						
							
							
								
								BUG
							
							
							
							
							
						 | 
						
							2024-03-07 14:09:08 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								2438f65d9e
								
							
								
							
						 | 
						
							
							
								
								商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题
							
							
							
							
							
							
							
							(cherry picked from commit 9ff4f1f7a9) 
							
						 | 
						
							2024-03-07 13:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								9ce5e4a178
								
							
								
							
						 | 
						
							
							
								
								修复商城首页,快捷入口的图标宽高不一致的问题
							
							
							
							
							
							
							
							(cherry picked from commit a7512ba2c7) 
							
						 | 
						
							2024-03-07 13:10:06 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								1851191430
								
							
								
							
						 | 
						
							
							
								
								local不能作为环境名,改为local-dev
							
							
							
							
							
							
							
							(cherry picked from commit 5002fc5fcc) 
							
						 | 
						
							2024-03-07 13:09:58 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								e5ad02666c
								
							
								
							
						 | 
						
							
							
								
								整理运行环境配置文件
							
							
							
							
							
							
							
							(cherry picked from commit 16aac73858) 
							
						 | 
						
							2024-03-07 13:09:05 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								57fcddd6c7
								
							
								
							
						 | 
						
							
							
								
								营销:完善装修编辑器预览功能
							
							
							
							
							
							
							
							(cherry picked from commit cd89f75b07) 
							
						 | 
						
							2024-03-07 13:05:29 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								59ebc1ea8f
								
							
								
							
						 | 
						
							
							
								
								营销:完善装修编辑器预览功能
							
							
							
							
							
							
							
							(cherry picked from commit 784623724d) 
							
						 | 
						
							2024-03-07 13:05:23 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								898faf0999
								
							
								
							
						 | 
						
							
							
								
								营销:完善装修编辑器重置功能
							
							
							
							
							
							
							
							(cherry picked from commit eec3a21852) 
							
						 | 
						
							2024-03-07 13:05:16 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								9f64a1093d
								
							
								
							
						 | 
						
							
							
								
								修复首页头像不显示
							
							
							
							
							
							
							
							(cherry picked from commit 9128fa98f5) 
							
						 | 
						
							2024-03-07 13:05:12 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								70a8fb7d66
								
							
								
							
						 | 
						
							
							
								
								📈 CRM:code review 联系人商机功能
							
							
							
							
							
							
							
							(cherry picked from commit ce79dd68a3) 
							
						 | 
						
							2024-03-07 13:04:08 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								4150ffba48
								
							
								
							
						 | 
						
							
							
								
								🔨 CRM:优化产品分类代码的实现
							
							
							
							
							
							
							
							(cherry picked from commit f8c4700c2e) 
							
						 | 
						
							2024-03-07 13:04:01 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								2be6f196e6
								
							
								
							
						 | 
						
							
							
								
								🔨 CRM:优化产品代码的实现
							
							
							
							
							
							
							
							(cherry picked from commit b3d66cd0aa) 
							
						 | 
						
							2024-03-07 13:03:54 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								72b82625b9
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确
							
							
							
							
							
						 | 
						
							2024-03-07 13:03:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZENGlei11350
							
						 | 
						
							
							
							
							
								
							
								7b0ff72a2b
								
							
								
							
						 | 
						
							
							
								
								优化:添加商品时0库存商品无法保存改为可以保存
							
							
							
							
							
							
							
							(cherry picked from commit dee8215da2) 
							
						 | 
						
							2024-03-07 13:02:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZanGe丶
							
						 | 
						
							
							
							
							
								
							
								776fed6a5d
								
							
								
							
						 | 
						
							
							
								
								【crm:优化产品及产品分类】
							
							
							
							
							
							
							
							(cherry picked from commit dde61c29a0) 
							
						 | 
						
							2024-03-07 13:02:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zyna
							
						 | 
						
							
							
							
							
								
							
								7c9cf67fb0
								
							
								
							
						 | 
						
							
							
								
								联系人商机功能
							
							
							
							
							
							
							
							(cherry picked from commit ba49b2851c) 
							
						 | 
						
							2024-03-07 13:02:00 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								021edf5662
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 job 在 IDEA 报错的问题
							
							
							
							
							
						 | 
						
							2024-03-07 12:57:05 +08:00 | 
						
					
				
					
						
							
							
								 
								liuhongfeng
							
						 | 
						
							
							
							
							
								
							
								91bf155409
								
							
								
							
						 | 
						
							
							
								
								【修改】ureport2 集成
							
							
							
							
							
							
							
							(cherry picked from commit 0b9cf35b17) 
							
						 | 
						
							2024-03-07 12:56:23 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								963a902eb0
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 file 在 IDEA 报错的问题
							
							
							
							
							
						 | 
						
							2024-03-07 12:56:03 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								255708beec
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 IDEA 在 `v-for="dict in getIntDictOptions(...)"` 时,`el-option` 的 `key` 会告警的问题
							
							
							
							
							
						 | 
						
							2024-03-07 12:55:25 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								f372fc0cdc
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 user 在 IDEA 报错的问题
							
							
							
							
							
						 | 
						
							2024-03-07 12:51:49 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								b062da358a
								
							
								
							
						 | 
						
							
							
								
								fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误
							
							
							
							
							
							
							
							(cherry picked from commit f3e89c0c55) 
							
						 | 
						
							2024-03-07 12:49:35 +08:00 | 
						
					
				
					
						
							
							
								 
								shizhong
							
						 | 
						
							
							
							
							
								
							
								4721455926
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 tenant 在 IDEA 报错的问题
							
							
							
							
							
						 | 
						
							2024-03-07 12:49:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								cb7543ef3d
								
							
								
							
						 | 
						
							
							
								
								🐛 修复 social 在 IDEA 报错的问题
							
							
							
							
							
							
							
							(cherry picked from commit a6deb69ddc) 
							
						 | 
						
							2024-03-07 12:47:51 +08:00 |