Commit Graph

305 Commits

Author SHA1 Message Date
Leufolium 4f2d33e674 Merge branch 'feat-IRONFANS-148-Robin' into cfl 2024-06-18 19:46:31 +08:00
Leufolium ae4b8558f3 by Robin at 20240618 2024-06-18 19:40:09 +08:00
Leufolium 6159759111 by Robin at 20240617 2024-06-17 22:25:43 +08:00
Leufolium 70422fce3a 1 2024-06-15 19:06:47 +08:00
lwl0608 6381d071e1 merg 2024-06-15 14:35:43 +08:00
lwl0608 0e3e21cd86 create_order_wx_pub 2024-06-15 14:33:15 +08:00
lwl0608 7d27928218 fix 2024-06-15 14:29:35 +08:00
lwl0608 2cf1c99ce5 fix 2024-06-15 14:26:52 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 591238f896 merge 2024-06-15 13:24:23 +08:00
Leufolium f73dd1cff7 By Robin at 20240615 2024-06-15 11:41:12 +08:00
lwl0608 97393ca46c refund 优化 2024-06-14 18:59:17 +08:00
lwl0608 59f495b266 fix 优化 2024-06-14 18:58:03 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 ba0a6c25fb fix refund 2024-06-14 18:37:50 +08:00
lwl0608 8e4e6087b6 fix 2024-06-14 18:37:42 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
lwl0608 f314affd2b Merge branch 'dev-lwl/iap' into test 2024-06-14 10:26:10 +08:00
lwl0608 064300871b fix 2024-06-14 10:20:08 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
lwl0608 551b9f10ee x 2024-06-05 10:53:18 +08:00
lwl0608 8ba557f493 add applepay_callback 2024-06-05 10:52:59 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
lwl0608 b02fe65dd6 Merge branch 'dev-lwl/fix_unlock_superfan' into test 2024-05-29 15:26:31 +08:00
lwl0608 6d1e62324e manual unlock wechat 2024-05-29 15:26:24 +08:00
lwl0608 fd79830b22 merge 2024-05-29 14:37:28 +08:00
lwl0608 4887207e0a withdraw recover 2024-05-29 14:35:52 +08:00
lwl0608 ad7dd3b052 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:37:58 +08:00
lwl0608 fe3cb342d6 fix yeepay callback 2024-05-27 19:37:52 +08:00
lwl0608 31f4673b94 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:23:13 +08:00
lwl0608 49561af1de fix yeepay callback 2024-05-27 19:23:05 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
chenhao 2ff7822af8 Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
2024-05-27 16:28:00 +08:00
Leufolium c9fa28946f Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-23 22:44:51 +08:00
Leufolium 124dd84c83 by Robin at 20240523 2024-05-23 22:39:37 +08:00
Leufolium 5cd103dac2 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin-2' into conf 2024-05-21 23:15:47 +08:00
Leufolium b8b228eb02 by Robin at 20240521 2024-05-21 23:12:25 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
Leufolium 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
lwl0608 2d15e3bf70 ip 2024-05-21 19:58:24 +08:00
lwl0608 8107f4e4b9 fix 2024-05-21 19:57:46 +08:00
lwl0608 1a19cc2f08 fix 2024-05-21 19:57:46 +08:00
lwl0608 801fe5cbe0 fix 2024-05-21 19:57:46 +08:00
lwl0608 0ec33fa81b consul 2024-05-21 19:57:19 +08:00
lwl0608 2ae1c452b3 add 2024-05-21 19:56:53 +08:00
Leufolium 9eb02d2788 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-21 18:37:01 +08:00
Leufolium 169a34247f by Robin at 20240521 2024-05-21 18:26:30 +08:00