Commit Graph

2620 Commits

Author SHA1 Message Date
wangsongsole 71f969dcc2 Merge branch 'master' into openType 2024-03-05 16:59:29 +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
wangsongsole 97958076e1 💪 optimize: 优化微信立减金打开方式 2024-03-05 10:55:38 +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
wangsongsole 805a1cc2b4 Merge branch 'master' into openType 2024-03-05 09:59:50 +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
wangsongsole 2b6f5a2e5f 🦀️ fix: 修复bug 2024-03-04 15:13:13 +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
wangsongsole d9112d0ee4 🗑️ delete: 删除log 2024-03-04 14:47:21 +08:00
zhangds eb63062fb9 fix: 修复营销系统 bug 2024-03-04 14:41:36 +08:00
wangsongsole c8662fbd9b feat: 组合商品新增微信立减金打开方式 2024-03-04 14:40:18 +08:00
zhangds d1c9bacb95 fix: 修复 兑换码包码 2024-03-04 14:28:13 +08:00
wangsongsole 5cf00128ea 🎨 style: 优化组合商品模板样式 2024-03-04 11:53:27 +08:00
wangsongsole 462843304e feat: 对接动态商户加密类型 2024-03-04 11:28:07 +08:00
wangsongsole 7e89178ff0 🦀️ fix: 修复bug 2024-03-04 10:50:13 +08:00
wangsongsole 04ab296f0a 🎨 style: 优化组合商品模板样式 2024-03-04 10:23:41 +08:00
wangsongsole c6ff21aa06 🎨 style: 优化样式 2024-03-04 10:21:46 +08:00
wangsongsole f2db850fe4 🔀 merge: 合并分支 2024-03-04 10:14:59 +08:00
zhangds 5c7547f2ce fix: 修复兑换码 包码 2024-03-03 17:38:30 +08:00
zhangds bd401463de fix: 修改编辑 2024-03-03 17:37:06 +08:00
zhangds cfe12e4d4c fix: 修复白名单 包码结算 2024-03-03 17:19:46 +08:00
zhangds 3c38a9fa99 fix: 修复兑换码列表 复制和编辑 2024-03-03 16:13:02 +08:00
zhangds 000f6de836 fix: 修改兑换码管理,复制和编辑包码不可操作 2024-03-03 16:04:36 +08:00
zhangds 626f39063f fix: 修改测试地址 2024-03-03 15:45:00 +08:00
wangsongsole 6d625181b8 🔖 version: 发布 2024-03-02 03:24:51 +08:00
wangsongsole 6deeaacf0a 🦀️ fix: 修复bug 2024-03-02 03:17:27 +08:00
wangsongsole e77db22db1 🔖 version: 镜像包 2024-03-02 03:12:36 +08:00
wangsongsole ceea15288b 🔖 version: 发布 2024-03-02 01:32:10 +08:00
wangsongsole 1599254ae8 🔖 version: 测试 2024-03-02 01:31:12 +08:00
wangsongsole 70f676218b 🦀️ fix: 修复bug 2024-03-02 01:29:16 +08:00
wangsongsole 42cdc06100 🔖 version: 发布 2024-03-02 01:17:44 +08:00