Commit Graph

2532 Commits

Author SHA1 Message Date
zhangds 2cfc473d23 fix: 修复兑换码 2024-03-06 22:21:34 +08:00
zhangds 89f2d1742d fix: 修复组合商品为立减金,禁用 2024-03-06 21:12:54 +08:00
zhangds 02c54c9812 fix: 锁定库存 2024-03-06 20:48:25 +08:00
zhangds 7130c5d136 fix: 修复组合商品为立减金,使用成功结算无法添加 2024-03-06 20:36:42 +08:00
wangsongsole 612c23c16a 🔖 version: 镜像包 2024-03-06 14:28:30 +08:00
wangsongsole 4b4ce49c3d 🔀 merge: 合并分支 2024-03-06 14:26:52 +08:00
wangsongsole a36e7eb767 🔖 version: 镜像包 2024-03-06 14:24:02 +08:00
wangsongsole 51f358a636 🦀️ fix: 解决组合商品模板报错问题 2024-03-06 14:15:58 +08:00
wangsongsole e10680712c 🔖 version: 测试包 2024-03-06 13:55:40 +08:00
wangsongsole 5be69c51cc 🔖 version: 发布测试包 2024-03-06 13:53:02 +08:00
wangsongsole a9906f78ea 🦀️ fix: 修复分销商商户bug 2024-03-06 13:52:12 +08:00
zhangds b8638e8587 fix: 镜像环境 2024-03-06 13:47:37 +08:00
zhangds c5f2680dba fix: 打包 2024-03-06 13:34:48 +08:00
zhangds 0def09c38d Merge branch 'merchant' into clearingForm 2024-03-06 13:33:02 +08:00
wangsongsole 932d8040fe 💪 optimize: 优化立减金使用说明引用 2024-03-06 10:40:13 +08:00
zhangds 4dbb6acb12 fix: 修复组合商品 2024-03-05 20:09:45 +08:00
zhangds 9861444f34 fix: 修复组合商品 2024-03-05 20:07:56 +08:00
zhangds f4bfd1f1f4 fix: 修复 bug 2024-03-05 18:15:05 +08:00
zhangds 482f1856ab Merge branch 'flex' into clearingForm 2024-03-05 18:07:23 +08:00
zhangds 912ae44099 fix: 合并master 2024-03-05 17:46:24 +08:00
zhangds 1ff519a60d Merge branch 'master' into clearingForm 2024-03-05 17:38:46 +08:00
wangsongsole 8f46242cbc 🦀️ fix: 修复线上bug 2024-03-05 17:31:17 +08:00
wangsongsole b0721b9717 🦀️ fix: 修复复制计划组合商品现在不正常问题 2024-03-05 17:28:15 +08:00
wangsongsole b60266e5a3 🔖 version: 发布镜像包 2024-03-05 17:02:13 +08:00
wangsongsole 1da55200bf Merge branch 'master' into merchant 2024-03-05 16:58:51 +08:00
wangsongsole 73e69f2fc6 🦀️ fix: 修复bug 2024-03-05 16:57:36 +08:00
wangsongsole 89be51a37d 🦀️ fix: 修复bug 2024-03-05 16:38:12 +08:00
wangsongsole 6574631557 🦀️ fix: 修复bug 2024-03-05 15:47:32 +08:00
wangsongsole 84be11b14a 🔖 version: 镜像包 2024-03-05 14:13:18 +08:00
zhangds f5ca1c6d91 fix: 修改白名单 2024-03-05 11:56:21 +08:00
zhangds df6f9e3621 fix: 增加新增编辑复制,白名单判断 2024-03-05 11:52:20 +08:00
zhangds a7a5159d55 Merge branch 'master' into clearingForm 2024-03-05 10:28:29 +08:00
wangsongsole b4c6cddad9 Merge branch 'master' into merchant 2024-03-05 10:00:06 +08:00
zhangds e17c715a2b feat: 增加组合商品 包码兼容 2024-03-04 18:29:30 +08:00
wangsongsole b0738baff5 🎨 style: 优化组合商品模板组件样式 2024-03-04 17:26:03 +08:00
zhangds 0cc54eedff fix: 更新planid 2024-03-04 16:41:01 +08:00
zhangds 73a47ab310 fix: 增加计划id 2024-03-04 16:33:47 +08:00
zhangds b2dc758703 fix: 增加计划 plan id 2024-03-04 16:22:21 +08:00
zhangds b685cd8ca5 fix: 增加key批次plan id 2024-03-04 16:16:52 +08:00
zhangds 84eed85e11 fix: 增加复制的id 2024-03-04 16:10:15 +08:00
zhangds 85b2711cbc fix: 增加合并后的代码 2024-03-04 15:46:39 +08:00
wangsongsole 3ad11ac05c 🦀️ fix: 修正兑换码管理-组合商品-发放总量校验问题 2024-03-04 15:45:10 +08:00
zhangds c91eeb39a4 Merge branch 'master' into clearingForm 2024-03-04 15:44:26 +08:00
zhangds 782dac1c5c fix: 兼容 组合商品 2024-03-04 15:39:26 +08:00
wangsongsole a981c4378f 🦀️ fix: 修复bug 2024-03-04 15:30:34 +08:00
zhangds 0b9e2e6c24 fix: 删除build 2024-03-04 15:11:08 +08:00
zhangds afdaf75932 fix: 修复包码列表 2024-03-04 15:06:30 +08:00
zhangds eb63062fb9 fix: 修复营销系统 bug 2024-03-04 14:41:36 +08:00
zhangds d1c9bacb95 fix: 修复 兑换码包码 2024-03-04 14:28:13 +08:00
wangsongsole 5cf00128ea 🎨 style: 优化组合商品模板样式 2024-03-04 11:53:27 +08:00