YunaiV
							
						 | 
						
							
							
							
							
								
							
								9d0e77b624
								
							
								
							
						 | 
						
							
							
								
								【功能修复】商城:指定发卷、新人卷,支持无限发放的兜底
							
							
							
							
							
						 | 
						
							2024-09-11 20:55:38 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								8d116599b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2024-09-11 12:30:45 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								e1502d15a2
								
							
								
							
						 | 
						
							
							
								
								【缺陷修复】商城:去掉 Number(params.propertyId) 的 Number,解决对雪花算法的兼容性
							
							
							
							
							
						 | 
						
							2024-09-11 12:30:36 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								823530bbc9
								
									
								
							
								
							
						 | 
						
							
							
								
								!547 【代码优化】商城: 满减活动范围支持分类多选
							
							
							
							
							
							
							
							Merge pull request !547 from puhui999/dev-crm 
							
						 | 
						
							2024-09-10 13:09:06 +00:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								cb6e716ce2
								
							
								
							
						 | 
						
							
							
								
								【代码优化】注册的逻辑实现
							
							
							
							
							
						 | 
						
							2024-09-10 21:04:46 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b1e3337cb4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/Login/components/RegisterForm.vue 
							
						 | 
						
							2024-09-10 20:58:40 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								1a0ff0215d
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 满减活动范围支持分类多选
							
							
							
							
							
						 | 
						
							2024-09-10 15:11:57 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								0e2000550a
								
									
								
							
								
							
						 | 
						
							
							
								
								!546 【代码优化】商城: 满减送活动
							
							
							
							
							
							
							
							Merge pull request !546 from puhui999/dev-crm 
							
						 | 
						
							2024-09-10 04:52:07 +00:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								4fcc33ec60
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 满减活动增加关闭操作
							
							
							
							
							
						 | 
						
							2024-09-10 12:25:14 +08:00 | 
						
					
				
					
						
							
							
								 
								scholar
							
						 | 
						
							
							
							
							
								
							
								b2dd170884
								
							
								
							
						 | 
						
							
							
								
								实现注册功能
							
							
							
							
							
						 | 
						
							2024-09-10 11:35:49 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								5a3ae2ab7a
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 限时折扣活动新增 spu 保存 fix
							
							
							
							
							
						 | 
						
							2024-09-09 09:37:39 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								f07c74d83c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2024-09-09 09:30:56 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1bd853bb32
								
									
								
							
								
							
						 | 
						
							
							
								
								!545 【代码优化】商城: 限时折扣活动
							
							
							
							
							
							
							
							Merge pull request !545 from puhui999/dev-crm 
							
						 | 
						
							2024-09-09 01:30:21 +00:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								cb34733318
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'yudao/dev' into dev-crm
							
							
							
							
							
						 | 
						
							2024-09-08 22:43:57 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								ed54cfe519
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 限时折扣活动新增 spu 保存 fix
							
							
							
							
							
						 | 
						
							2024-09-08 22:40:47 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								7bb482a829
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 限时折扣活动 sku 自动计算对应的满减/折扣
							
							
							
							
							
						 | 
						
							2024-09-08 22:29:35 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								2e207ddef9
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: spu 详情价格回显错误 fix
							
							
							
							
							
						 | 
						
							2024-09-08 21:19:48 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								e5ec820127
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2024-09-07 16:54:20 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								3e55015d77
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
							
							
							
							
							
							
							
							# Conflicts:
#	src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
#	src/views/ai/mindmap/manager/index.vue 
							
						 | 
						
							2024-09-07 16:53:40 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								beaf533a14
								
									
								
							
								
							
						 | 
						
							
							
								
								!540 【功能修复】修复新创建用户未上传头像时,头像不显示的bug。 修复布局配置中标签页图标key错误的bug
							
							
							
							
							
							
							
							Merge pull request !540 from kuxiao/pass20240907 
							
						 | 
						
							2024-09-07 08:15:14 +00:00 | 
						
					
				
					
						
							
							
								 
								zqx
							
						 | 
						
							
							
							
							
								
							
								307743b7d0
								
							
								
							
						 | 
						
							
							
								
								【功能修复】修复新创建用户未上传头像时,头像不显示的bug。
							
							
							
							
							
							
							
							【功能修复】修复布局配置中标签页图标key错误的bug 
							
						 | 
						
							2024-09-07 15:38:39 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b5c4da073a
								
									
								
							
								
							
						 | 
						
							
							
								
								!539 【功能修复】修复拼团装修的价格显示
							
							
							
							
							
							
							
							Merge pull request !539 from 卢越/master 
							
						 | 
						
							2024-09-06 14:32:34 +00:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								3dc02f7282
								
							
								
							
						 | 
						
							
							
								
								【功能修复】修复拼团的价格显示
							
							
							
							
							
						 | 
						
							2024-09-06 22:23:15 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								7d60b5a619
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城:拼团装修重构
							
							
							
							
							
						 | 
						
							2024-09-06 20:55:08 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a2091df2df
								
									
								
							
								
							
						 | 
						
							
							
								
								!537 【功能优化】拼团装修重构
							
							
							
							
							
							
							
							Merge pull request !537 from 卢越/master 
							
						 | 
						
							2024-09-06 12:39:44 +00:00 | 
						
					
				
					
						
							
							
								 
								scholar
							
						 | 
						
							
							
							
							
								
							
								2205526a79
								
							
								
							
						 | 
						
							
							
								
								优化代码实现。
							
							
							
							
							
						 | 
						
							2024-09-06 16:14:59 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								fd6fd9e520
								
							
								
							
						 | 
						
							
							
								
								【代码优化】SYSTEM:快速开关菜单的按钮
							
							
							
							
							
						 | 
						
							2024-09-06 09:20:32 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								15ed1cf5c2
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #54 from DevDengChao/feat/menu-status-switch
							
							
							
							
							
							
							
							feat: 新增快速开关菜单的按钮 
							
						 | 
						
							2024-09-06 09:15:27 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d7e0b771ef
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #84 from GoldenZqqq/bpm-optimization
							
							
							
							
							
							
							
							工作流审批页面样式优化 
							
						 | 
						
							2024-09-06 09:13:13 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								52f804e204
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #81 from ion1ze/master
							
							
							
							
							
							
							
							bugfix: 移动端浅色模式下标题语言颜色异常 
							
						 | 
						
							2024-09-06 09:12:07 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7ba29c97aa
								
									
								
							
								
							
						 | 
						
							
							
								
								!535 feat: ✨ add closeOnPressEscape to ElMessageBox
							
							
							
							
							
							
							
							Merge pull request !535 from AhJindeg/hotfix/handleAuthorized 
							
						 | 
						
							2024-09-05 12:10:23 +00:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								4f941df55c
								
							
								
							
						 | 
						
							
							
								
								【代码优化】代码格式化
							
							
							
							
							
						 | 
						
							2024-09-05 15:15:19 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								4870231b61
								
							
								
							
						 | 
						
							
							
								
								【代码优化】代码格式化
							
							
							
							
							
						 | 
						
							2024-09-05 12:46:58 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								40fe63a3fb
								
							
								
							
						 | 
						
							
							
								
								【代码优化】拼团活动和SPU详情分开查询
							
							
							
							
							
						 | 
						
							2024-09-05 10:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								03356576b3
								
							
								
							
						 | 
						
							
							
								
								【功能优化】拼团组件默认为单列大图
							
							
							
							
							
						 | 
						
							2024-09-04 23:08:01 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								10c95406d8
								
							
								
							
						 | 
						
							
							
								
								【代码优化】接口地址修正
							
							
							
							
							
						 | 
						
							2024-09-04 22:58:16 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								757f10cbe6
								
							
								
							
						 | 
						
							
							
								
								【功能优化】现在每次点击装修组件都刷新右侧属性窗口
							
							
							
							
							
						 | 
						
							2024-09-04 17:40:10 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								19789fabf5
								
							
								
							
						 | 
						
							
							
								
								【代码优化】拼团卡片组件名
							
							
							
							
							
						 | 
						
							2024-09-04 10:39:57 +08:00 | 
						
					
				
					
						
							
							
								 
								卢越
							
						 | 
						
							
							
							
							
								
							
								c486dfd87a
								
							
								
							
						 | 
						
							
							
								
								【功能优化】重构拼团装修(仍需优化)
							
							
							
							
							
						 | 
						
							2024-09-03 15:52:38 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								c4fda86747
								
							
								
							
						 | 
						
							
							
								
								【功能修复】商城:店铺装修的价格展示,没有 / 100 在管理后台的预览时
							
							
							
							
							
						 | 
						
							2024-09-03 15:31:15 +08:00 | 
						
					
				
					
						
							
							
								 
								AhJindeg
							
						 | 
						
							
							
							
							
								
							
								f750e3b41b
								
							
								
							
						 | 
						
							
							
								
								feat: ✨ add closeOnPressEscape to ElMessageBox
							
							
							
							
							
						 | 
						
							2024-09-03 09:28:17 +08:00 | 
						
					
				
					
						
							
							
								 
								GoldenZqqq
							
						 | 
						
							
							
							
							
								
							
								428f976034
								
							
								
							
						 | 
						
							
							
								
								chore: 删除多余添加的元素类
							
							
							
							
							
						 | 
						
							2024-09-03 09:06:19 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8362665f2b
								
									
								
							
								
							
						 | 
						
							
							
								
								!533 fix:  delete href.includes('login?redirect=')
							
							
							
							
							
							
							
							Merge pull request !533 from AhJindeg/hotfix/handleAuthorized 
							
						 | 
						
							2024-09-02 14:45:09 +00:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								18880c71db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
							
							
							
							
							
						 | 
						
							2024-09-02 22:31:00 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a2b378b131
								
									
								
							
								
							
						 | 
						
							
							
								
								!534 【代码优化】商城: 满减送活动
							
							
							
							
							
							
							
							Merge pull request !534 from puhui999/dev-crm 
							
						 | 
						
							2024-09-02 14:30:47 +00:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								dcc1a3e9d5
								
							
								
							
						 | 
						
							
							
								
								【代码优化】商城: 满减送活动
							
							
							
							
							
						 | 
						
							2024-09-02 17:21:10 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								9329978f6d
								
							
								
							
						 | 
						
							
							
								
								【代码优化】】商城: 满减送活动提示弱化一点
							
							
							
							
							
						 | 
						
							2024-09-02 17:05:01 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								9aa7706722
								
							
								
							
						 | 
						
							
							
								
								【代码优化】】商城: 满减送活动
							
							
							
							
							
						 | 
						
							2024-09-02 16:53:55 +08:00 | 
						
					
				
					
						
							
							
								 
								GoldenZqqq
							
						 | 
						
							
							
							
							
								
							
								a9623e3001
								
							
								
							
						 | 
						
							
							
								
								feat: 审批记录时间线抽取为单独组件;时间线整体样式优化、展示逻辑TODO
							
							
							
							
							
						 | 
						
							2024-09-02 11:34:03 +08:00 | 
						
					
				
					
						
							
							
								 
								AhJindeg
							
						 | 
						
							
							
							
							
								
							
								8547b28d63
								
							
								
							
						 | 
						
							
							
								
								fix: 🐞 delete href.includes('login?redirect=')
							
							
							
							
							
						 | 
						
							2024-09-02 10:42:41 +08:00 |