Commit Graph

257 Commits

Author SHA1 Message Date
chenhao 81dda7dd72 Merge pull request '1' (#604) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/604
2024-07-09 21:54:27 +08:00
Leufolium 883db65ea4 1 2024-07-09 21:54:04 +08:00
Leufolium d33813ee61 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin 2024-07-03 16:53:02 +08:00
lwl0608 f75e9a9377 test xl01 2024-07-03 15:59:47 +08:00
lwl0608 661db0acc4 Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:59:33 +08:00
lwl0608 8702c44a2c fix config 2024-07-03 15:59:27 +08:00
lwl0608 b035e3430f Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-03 15:54:50 +08:00
lwl0608 6f6cf0c7cf add xl01 2024-07-03 15:54:41 +08:00
Leufolium 1323aef6db Merge branch 'feat-IRONFANS-139-Robin' into conflict 2024-07-03 15:15:29 +08:00
Leufolium 551d420c3f by Robin at 20240703 2024-07-03 15:13:04 +08:00
chenhao 963ae63c08 Merge pull request '1' (#585) from feat-IRONFANS-139-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/585
2024-07-02 19:57:58 +08:00
Leufolium 561df91f82 1 2024-07-02 19:57:28 +08:00
Leufolium 9585090251 Merge branch 'feat-IRONFANS-139-Robin' into test 2024-07-02 19:55:25 +08:00
Leufolium 0836a4baea by Robin at 20240702 2024-07-02 19:53:29 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
Leufolium fd19b615b7 Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-06-25 18:31:54 +08:00
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
chenhao 606c7030a9 Merge pull request 'by Robin at 20240619' (#542) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/542
2024-06-19 13:59:36 +08:00
Leufolium e6d1b90338 by Robin at 20240619 2024-06-19 13:58:47 +08:00
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 324d4bc523 by Robin at 20240618 2024-06-18 17:10:42 +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
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +08:00
lwl0608 d28f58a733 f 2024-06-13 16:43:31 +08:00
lwl0608 571a961151 apple 2024-06-13 16:40:22 +08:00
chenhao a614e015a4 Merge pull request 'feat-IRONFANS-147-Robin' (#529) from feat-IRONFANS-147-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/529
2024-06-13 12:32:16 +08:00
Leufolium 559976b33a by Robin at 20240611 2024-06-11 19:40:35 +08:00
lwl0608 7df284d010 f 2024-06-09 00:02:37 +08:00
Leufolium 192b5c180e Merge remote-tracking branch 'origin/main' into test 2024-06-04 17:21:52 +08:00
lwl0608 d25a7a13de log 2024-06-03 10:33:27 +08:00
lwl0608 7af540c2a7 Merge branch 'main' into dev-lwl/consul 2024-06-03 10:08:45 +08:00
lwl0608 99baf50984 t 2024-06-03 10:08:15 +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 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
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 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