Commit Graph

1402 Commits

Author SHA1 Message Date
chenhao 906f8ca05c Merge pull request 'by Robin at 20240530' (#519) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/519
2024-05-30 15:24:11 +08:00
Leufolium a6e3a3ee12 by Robin at 20240530 2024-05-30 15:23:40 +08:00
chenhao 6720b5769e Merge pull request 'yeepay' (#518) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/518
2024-05-30 15:06:16 +08:00
Leufolium d1dcf7a7e1 yeepay 2024-05-30 15:05:59 +08:00
Leufolium db090898a6 yeepay 2024-05-30 15:05:32 +08:00
chenhao d0d452a1f7 Merge pull request '1' (#517) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/517
2024-05-30 14:58:14 +08:00
Leufolium 7b237ed87e 1 2024-05-30 14:58:00 +08:00
chenhao 52219a36c5 Merge pull request 'feat-IRONFANS-58-Robin' (#516) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/516
2024-05-30 14:56:13 +08:00
Leufolium c9e6889aa2 by Robin at 20240530 2024-05-30 14:53:38 +08:00
lwl0608 1a4140c32a Merge branch 'dev-lwl/yop' into test 2024-05-30 11:10:03 +08:00
lwl0608 dcf2057a86 redirect url 2024-05-30 11:09:59 +08:00
lwl0608 f19658caf3 Merge branch 'dev-lwl/yop' into test 2024-05-30 09:48:17 +08:00
lwl0608 1920418c31 fix 2024-05-30 09:48:09 +08:00
lwl0608 33e44c9838 Merge branch 'dev-lwl/fix_unlock_superfan' into test 2024-05-29 16:14:56 +08:00
lwl0608 c5caa7bb75 superfan unlock wechat 2024-05-29 16:14:50 +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 c3165aa0c2 x 2024-05-29 14:34:58 +08:00
lwl0608 b5dca9fa04 Merge branch 'dev-lwl/yop' into test 2024-05-29 10:56:59 +08:00
lwl0608 cc93c10aa2 退款 2024-05-29 10:56:52 +08:00
Leufolium d9d60f69a6 by Robin at 20240529 2024-05-29 10:48:29 +08:00
chenhao d5ae637214 Merge pull request 'feat-IRONFANS-125-Robin' (#515) from feat-IRONFANS-125-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/515
2024-05-28 13:11:39 +08:00
Leufolium 690a5b31f6 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-125-Robin 2024-05-28 13:11:21 +08:00
Leufolium f780b95506 by Robin 2024-05-28 13:09:59 +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 316f0c277f Merge branch 'dev-lwl/yop' into test 2024-05-27 16:56:09 +08:00
lwl0608 72d858539f vendor 2024-05-27 16:55:55 +08:00
lwl0608 3662e9f321 yop 2024-05-27 16:54:57 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 53797b066c yop 2024-05-27 16:50:58 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
lwl0608 675a6e42fb yeepay 2024-05-27 16:48:25 +08:00
lwl0608 95bafcf056 yop 2024-05-27 16:48:25 +08:00
chenhao ea87e97408 Merge pull request 'conf' (#513) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/513
2024-05-27 16:40:54 +08:00
Leufolium ecc1b941ca Merge remote-tracking branch 'origin/main' into conf 2024-05-27 16:39:45 +08:00
chenhao c3f1f2089d Merge pull request 'by Robin at 20240527; offline etc' (#511) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/511
2024-05-27 16:38:39 +08:00
Leufolium 2c74eca4a8 by Robin at 20240527; offline etc 2024-05-27 16:38:19 +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
chenhao 72067fa808 Merge pull request 'main' (#509) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/509
2024-05-25 19:03:36 +08:00
chenhao bda85caf00 Merge pull request 'by Robin at 20240525' (#508) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/508
2024-05-25 19:02:29 +08:00
Leufolium ef00b9a1b7 by Robin at 20240525 2024-05-25 19:02:05 +08:00
chenhao abb4d1129a Merge pull request 'by Robin at 20240525' (#507) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/507
2024-05-25 18:21:23 +08:00
Leufolium c8f9f00a13 by Robin at 20240525 2024-05-25 18:20:49 +08:00
chenhao 1ac088da88 Merge pull request 'main' (#506) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/506
2024-05-25 13:15:16 +08:00
chenhao d1e884f42f Merge pull request 'by Robin at 20240525' (#505) from feat-IRONFANS-136-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/505
2024-05-25 13:15:07 +08:00