Commit Graph

222 Commits

Author SHA1 Message Date
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
lwl0608 95bafcf056 yop 2024-05-27 16:48:25 +08:00
Leufolium 9308fbd796 by Robin 2024-05-24 08:38:58 +08:00
Leufolium 4983f71f0e by RObin 2024-05-24 04:30:34 +08:00
Leufolium 7701447d64 Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conf 2024-05-24 02:59:59 +08:00
Leufolium 248b93ced7 by Robin at 20240524 2024-05-24 02:52:23 +08:00
Leufolium e428c72b6d Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-24 02:36:19 +08:00
Leufolium f7f0e53d5d by Robin at 20240524 2024-05-24 02:34:31 +08:00
chenhao e8aa3b20c5 Merge pull request '1231231' (#484) from feat-IRONFANS-133-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/484
2024-05-24 00:04:30 +08:00
Leufolium ceb46b5f38 1231231 2024-05-24 00:04:14 +08:00
Leufolium 865ce9434d Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-24 00:00:40 +08:00
Leufolium a54361d249 by Robin at 20240523 2024-05-23 23:59:14 +08:00
lwl0608 a0096de95b f 2024-05-23 11:31:10 +08:00
lwl0608 5d2735e957 cancel 2024-05-23 11:18:38 +08:00
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
lwl0608 10ff3f25ae merge 2024-05-21 20:05:44 +08:00
lwl0608 194dcc192d fix 2024-05-21 19:58:24 +08:00
lwl0608 51508a0f47 log fix 2024-05-21 19:58:23 +08:00
lwl0608 b2cc85ce8a fix 2024-05-21 19:57:46 +08:00
lwl0608 39cb4e3166 fix 2024-05-21 19:57:46 +08:00
lwl0608 0ebbd95ba7 fix 2024-05-21 19:57:46 +08:00
lwl0608 2b395f24aa fix 2024-05-21 19:57:46 +08:00
lwl0608 3d353514b5 fix 2024-05-21 19:57:46 +08:00
lwl0608 466916376e fix 2024-05-21 19:57:46 +08:00
lwl0608 0ec33fa81b consul 2024-05-21 19:57:19 +08:00
lwl0608 b57a826749 fix alipay notify url 2024-05-21 19:57:19 +08:00
lwl0608 c03854b6d1 fix 2024-05-21 19:57:19 +08:00
lwl0608 dc1feac378 vendor 2024-05-21 19:57:17 +08:00
lwl0608 b3836120e2 consul 2024-05-21 19:56:54 +08:00
lwl0608 2ae1c452b3 add 2024-05-21 19:56:53 +08:00
lwl0608 ee5585daf7 consul 2024-05-21 19:55:58 +08:00
lwl0608 38b3d67908 Merge branch 'dev-lwl/consul' into test 2024-05-21 17:18:35 +08:00
lwl0608 acf915b387 fix 2024-05-21 17:18:30 +08:00
lwl0608 26c86ccc49 merge 2024-05-21 17:17:20 +08:00
lwl0608 edd86f2bb8 log fix 2024-05-21 17:16:39 +08:00