puhui999
							
						 | 
						
							
							
							
							
								
							
								5359c4c862
								
							
								
							
						 | 
						
							
							
								
								解决列数据中的 table#header 数据不刷新的问题
							
							
							
							
							
							
							
							(cherry picked from commit ca385bc08e) 
							
						 | 
						
							2024-03-05 17:24:50 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								26c31812ad
								
							
								
							
						 | 
						
							
							
								
								chore: remove vue-macros/volar
							
							
							
							
							
							
							
							(cherry picked from commit 309c3f30d1) 
							
						 | 
						
							2024-03-05 17:24:16 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								16e0486768
								
							
								
							
						 | 
						
							
							
								
								fix: ElLoading need import
							
							
							
							
							
							
							
							(cherry picked from commit 238537df83) 
							
						 | 
						
							2024-03-05 17:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								345c2443be
								
							
								
							
						 | 
						
							
							
								
								chore: stylelint config
							
							
							
							
							
							
							
							(cherry picked from commit bf2c59c6e0) 
							
						 | 
						
							2024-03-05 17:23:53 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								0ed18fde8a
								
							
								
							
						 | 
						
							
							
								
								chore: eslint config
							
							
							
							
							
							
							
							(cherry picked from commit 50f1ae9524) 
							
						 | 
						
							2024-03-05 17:23:48 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								bdcdadfd20
								
							
								
							
						 | 
						
							
							
								
								chore: vscode setting
							
							
							
							
							
							
							
							(cherry picked from commit 96db6ab538) 
							
						 | 
						
							2024-03-05 17:23:43 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyu
							
						 | 
						
							
							
							
							
								
							
								1c86d00991
								
							
								
							
						 | 
						
							
							
								
								chore: update vue v3.3.7
							
							
							
							
							
							
							
							(cherry picked from commit b8403c1b90) 
							
						 | 
						
							2024-03-05 17:23:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Wanwan
							
						 | 
						
							
							
							
							
								
							
								c0a10146d6
								
							
								
							
						 | 
						
							
							
								
								feat: 客户表的 crud
							
							
							
							
							
							
							
							(cherry picked from commit 044754cdb4) 
							
						 | 
						
							2024-03-05 17:23:20 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								2f6202d76b
								
							
								
							
						 | 
						
							
							
								
								1.8.3 版本发布
							
							
							
							
							
							
							
							(cherry picked from commit ef334dfc66) 
							
						 | 
						
							2024-03-05 17:22:57 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								9bc0638598
								
							
								
							
						 | 
						
							
							
								
								修复 banner 返回字段不对
							
							
							
							
							
							
							
							(cherry picked from commit 539352f598) 
							
						 | 
						
							2024-03-05 17:22:51 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								6ca92b9251
								
							
								
							
						 | 
						
							
							
								
								code review:banner 逻辑
							
							
							
							
							
							
							
							(cherry picked from commit e5d6a9dae1) 
							
						 | 
						
							2024-03-05 17:22:30 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								11bc949309
								
							
								
							
						 | 
						
							
							
								
								优惠卷模版样式调整
							
							
							
							
							
							
							
							(cherry picked from commit 95d7d1eb42) 
							
						 | 
						
							2024-03-05 17:22:21 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								8c5cdd0ea5
								
							
								
							
						 | 
						
							
							
								
								商品 spu 脱离优惠卷模块
							
							
							
							
							
							
							
							(cherry picked from commit 75135e1e4f) 
							
						 | 
						
							2024-03-05 17:22:16 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								1298c3dd52
								
							
								
							
						 | 
						
							
							
								
								完善 banner 管理
							
							
							
							
							
							
							
							(cherry picked from commit a7439ee08b) 
							
						 | 
						
							2024-03-05 17:22:09 +08:00 | 
						
					
				
					
						
							
							
								 
								KONGDY-PC\Kongdy
							
						 | 
						
							
							
							
							
								
							
								5a67f1c051
								
							
								
							
						 | 
						
							
							
								
								满减页面布局
							
							
							
							
							
							
							
							(cherry picked from commit 7c8f7d570f) 
							
						 | 
						
							2024-03-05 17:22:06 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								eecf209aad
								
							
								
							
						 | 
						
							
							
								
								code review:banner 逻辑
							
							
							
							
							
							
							
							(cherry picked from commit 2dbfa77bee) 
							
						 | 
						
							2024-03-05 17:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b7c81fb37d
								
							
								
							
						 | 
						
							
							
								
								code review:限时折扣
							
							
							
							
							
							
							
							(cherry picked from commit 423ea319e0) 
							
						 | 
						
							2024-03-05 17:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								kehaiyou
							
						 | 
						
							
							
							
							
								
							
								6bffc7991f
								
							
								
							
						 | 
						
							
							
								
								fix: 【工作流】--加签减签review修改接口地址
							
							
							
							
							
							
							
							(cherry picked from commit 5cfb67d047) 
							
						 | 
						
							2024-03-05 17:21:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jason
							
						 | 
						
							
							
							
							
								
							
								16aba063d1
								
							
								
							
						 | 
						
							
							
								
								钱包 - 优化
							
							
							
							
							
							
							
							支付应用 - 证书模式增加应用私钥
(cherry picked from commit bb5945958b) 
							
						 | 
						
							2024-03-05 17:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								4fcdd63e51
								
							
								
							
						 | 
						
							
							
								
								新增 banner 管理
							
							
							
							
							
							
							
							(cherry picked from commit 491b3a5018) 
							
						 | 
						
							2024-03-05 17:21:03 +08:00 | 
						
					
				
					
						
							
							
								 
								913752709@qq.com
							
						 | 
						
							
							
							
							
								
							
								772ded7eca
								
							
								
							
						 | 
						
							
							
								
								feat: crm 线索表完善 review 提到的问题
							
							
							
							
							
							
							
							(cherry picked from commit fb90a85e43) 
							
						 | 
						
							2024-03-05 17:20:59 +08:00 | 
						
					
				
					
						
							
							
								 
								liuhongfeng
							
						 | 
						
							
							
							
							
								
							
								47f948f26b
								
							
								
							
						 | 
						
							
							
								
								【新增】回款计划 功能
							
							
							
							
							
							
							
							(cherry picked from commit 26780c3525) 
							
						 | 
						
							2024-03-05 17:20:37 +08:00 | 
						
					
				
					
						
							
							
								 
								liuhongfeng
							
						 | 
						
							
							
							
							
								
							
								7b020781f0
								
							
								
							
						 | 
						
							
							
								
								【新增】回款管理 功能
							
							
							
							
							
							
							
							(cherry picked from commit 7ad1457f79) 
							
						 | 
						
							2024-03-05 17:20:32 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								ea546e4831
								
							
								
							
						 | 
						
							
							
								
								完善文章管理 review 提到的问题
							
							
							
							
							
							
							
							(cherry picked from commit 0730e215d8) 
							
						 | 
						
							2024-03-05 17:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshuai
							
						 | 
						
							
							
							
							
								
							
								9f04b8e34b
								
							
								
							
						 | 
						
							
							
								
								限时折扣
							
							
							
							
							
							
							
							(cherry picked from commit 9f77514c17) 
							
						 | 
						
							2024-03-05 17:20:00 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								139f45003d
								
							
								
							
						 | 
						
							
							
								
								SPU: 新增完善活动优先级拖拽排序
							
							
							
							
							
							
							
							(cherry picked from commit 1e8945de63) 
							
						 | 
						
							2024-03-05 17:16:39 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								ccec7ad410
								
							
								
							
						 | 
						
							
							
								
								SPU: 完善优惠卷选择
							
							
							
							
							
							
							
							(cherry picked from commit 01d78429cc) 
							
						 | 
						
							2024-03-05 17:15:16 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								de53601fcb
								
							
								
							
						 | 
						
							
							
								
								SPU: 完善优惠卷选择
							
							
							
							
							
							
							
							(cherry picked from commit 18df708b49) 
							
						 | 
						
							2024-03-05 17:14:29 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								801ea4c176
								
							
								
							
						 | 
						
							
							
								
								code review:门店自提
							
							
							
							
							
							
							
							(cherry picked from commit 2457665b55) 
							
						 | 
						
							2024-03-05 17:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								e9da54b100
								
							
								
							
						 | 
						
							
							
								
								SPU: 新增优惠卷选择
							
							
							
							
							
							
							
							(cherry picked from commit 3464bb9c74) 
							
						 | 
						
							2024-03-05 17:12:24 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								b8b549462d
								
							
								
							
						 | 
						
							
							
								
								OrderTableColumn: 商品信息列样式调整2
							
							
							
							
							
							
							
							(cherry picked from commit 5b3bcecef2) 
							
						 | 
						
							2024-03-05 17:12:20 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								a313663c99
								
							
								
							
						 | 
						
							
							
								
								OrderTableColumn: 商品信息列样式调整
							
							
							
							
							
							
							
							(cherry picked from commit 094f8e16db) 
							
						 | 
						
							2024-03-05 17:12:15 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								067c89d987
								
							
								
							
						 | 
						
							
							
								
								UserOrderList 重构完善
							
							
							
							
							
							
							
							(cherry picked from commit 70778fd9e6) 
							
						 | 
						
							2024-03-05 17:12:09 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								9dae60b597
								
							
								
							
						 | 
						
							
							
								
								订单列表:完善表头宽度自适应
							
							
							
							
							
							
							
							(cherry picked from commit 5270c83876) 
							
						 | 
						
							2024-03-05 17:11:37 +08:00 | 
						
					
				
					
						
							
							
								 
								913752709@qq.com
							
						 | 
						
							
							
							
							
								
							
								a5f21a9b9f
								
							
								
							
						 | 
						
							
							
								
								feat: CRM 线索表 crud
							
							
							
							
							
							
							
							(cherry picked from commit 7af2a3bcc3) 
							
						 | 
						
							2024-03-05 17:11:33 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								bb18f469de
								
							
								
							
						 | 
						
							
							
								
								订单列表:自定义列抽离封装为组件
							
							
							
							
							
							
							
							(cherry picked from commit 04d88ce1a6) 
							
						 | 
						
							2024-03-05 17:11:17 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								432620ffec
								
							
								
							
						 | 
						
							
							
								
								营销文章:新增表单属性移除浏览量
							
							
							
							
							
							
							
							(cherry picked from commit d1a3fe5d5a) 
							
						 | 
						
							2024-03-05 17:10:30 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								d04c1f0213
								
							
								
							
						 | 
						
							
							
								
								统计卡片修改为全局组件
							
							
							
							
							
							
							
							(cherry picked from commit 431fff28ce) 
							
						 | 
						
							2024-03-05 17:08:22 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								174b95fdef
								
							
								
							
						 | 
						
							
							
								
								交易:核销订单
							
							
							
							
							
							
							
							(cherry picked from commit 61b3bdfd4c) 
							
						 | 
						
							2024-03-05 17:07:35 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								56b7e35d49
								
							
								
							
						 | 
						
							
							
								
								code review:crm 合同流程
							
							
							
							
							
							
							
							(cherry picked from commit 8832eafaae) 
							
						 | 
						
							2024-03-05 17:07:27 +08:00 | 
						
					
				
					
						
							
							
								 
								1163996518@qq.com
							
						 | 
						
							
							
							
							
								
							
								0e0456d4f8
								
							
								
							
						 | 
						
							
							
								
								支付渠道配置--修复权限
							
							
							
							
							
							
							
							(cherry picked from commit 533b4e5006) 
							
						 | 
						
							2024-03-05 17:07:21 +08:00 | 
						
					
				
					
						
							
							
								 
								1163996518@qq.com
							
						 | 
						
							
							
							
							
								
							
								6721122bc2
								
							
								
							
						 | 
						
							
							
								
								支付渠道配置--修复权限
							
							
							
							
							
							
							
							(cherry picked from commit d5328918ab) 
							
						 | 
						
							2024-03-05 17:07:17 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								231285a4ef
								
							
								
							
						 | 
						
							
							
								
								code review:修复工作流的审批界面报错问题
							
							
							
							
							
							
							
							(cherry picked from commit c27685285a) 
							
						 | 
						
							2024-03-05 17:06:53 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								18b7dd3b7e
								
							
								
							
						 | 
						
							
							
								
								交易:订单核销
							
							
							
							
							
							
							
							(cherry picked from commit 6fc232b758) 
							
						 | 
						
							2024-03-05 17:06:12 +08:00 | 
						
					
				
					
						
							
							
								 
								dhb52
							
						 | 
						
							
							
							
							
								
							
								d85494bf05
								
							
								
							
						 | 
						
							
							
								
								feat: CRM/合同 crud
							
							
							
							
							
							
							
							(cherry picked from commit dced551698) 
							
						 | 
						
							2024-03-05 17:05:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jason
							
						 | 
						
							
							
							
							
								
							
								1d602e0a31
								
							
								
							
						 | 
						
							
							
								
								钱包 - 钱包余额流水
							
							
							
							
							
							
							
							(cherry picked from commit c3f06f5fbe) 
							
						 | 
						
							2024-03-05 17:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jason
							
						 | 
						
							
							
							
							
								
							
								b3b9fbc201
								
							
								
							
						 | 
						
							
							
								
								钱包 - 钱包余额流水
							
							
							
							
							
							
							
							(cherry picked from commit 8626bccc4c) 
							
						 | 
						
							2024-03-05 17:03:54 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								aaead6c2b9
								
							
								
							
						 | 
						
							
							
								
								统计:修复错误
							
							
							
							
							
							
							
							(cherry picked from commit e3a0cfe5e9) 
							
						 | 
						
							2024-03-05 17:03:47 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								1dba566d1d
								
							
								
							
						 | 
						
							
							
								
								统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
							
							
							
							
							
							
							
							(cherry picked from commit 6204ce6c1b) 
							
						 | 
						
							2024-03-05 17:03:42 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								25a1e27a12
								
							
								
							
						 | 
						
							
							
								
								统计:Review修改
							
							
							
							
							
							
							
							(cherry picked from commit cd4b4cd322) 
							
						 | 
						
							2024-03-05 17:03:35 +08:00 |