Commit Graph

1526 Commits

Author SHA1 Message Date
lwl0608 3a4f4aacd2 fix 2024-06-04 17:50:03 +08:00
lwl0608 39ddeb698b merge 2024-06-04 17:46:47 +08:00
lwl0608 8bf8e9357f create order. add paytype: coin 2024-06-04 17:44:06 +08:00
Leufolium 192b5c180e Merge remote-tracking branch 'origin/main' into test 2024-06-04 17:21:52 +08:00
chenhao 9358a749c7 Merge pull request 'feat-IRONFANS-58-Robin' (#524) from feat-IRONFANS-58-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/524
2024-06-04 17:17:15 +08:00
Leufolium 84c371ca33 by Robin at 20240604 2024-06-04 17:03:14 +08:00
Leufolium 10636fa6a4 by Robin at 20240604 2024-06-04 12:16:17 +08:00
lwl0608 b35e2ac7a3 Merge branch 'dev-lwl/consul' 2024-06-03 10:43:20 +08:00
lwl0608 541c40ccc5 c 2024-06-03 10:43:14 +08:00
lwl0608 173c312eb8 Merge branch 'dev-lwl/consul' 2024-06-03 10:33:36 +08:00
lwl0608 d25a7a13de log 2024-06-03 10:33:27 +08:00
lwl0608 3f34a7a8fe vendor 2024-06-03 10:30:13 +08:00
lwl0608 98760d185b t 2024-06-03 10:24:43 +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
chenhao 3deeb6be7d Merge pull request 'by Robin at 20240530' (#523) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/523
2024-05-30 16:09:48 +08:00
Leufolium 3d2cc139d6 by Robin at 20240530 2024-05-30 16:01:19 +08:00
chenhao 7c3e21ab91 Merge pull request 'b' (#522) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/522
2024-05-30 15:57:43 +08:00
Leufolium 092481224a b 2024-05-30 15:57:29 +08:00
Leufolium c4ad05c918 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into test 2024-05-30 15:53:58 +08:00
Leufolium eeb5baf1bf by Robin at 20240530 2024-05-30 15:52:49 +08:00
chenhao ce2d7f7260 Merge pull request 'by Robin at 20240530' (#520) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/520
2024-05-30 15:38:10 +08:00
Leufolium ba5cd815ad by Robin at 20240530 2024-05-30 15:37:56 +08:00
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 10e55130a9 fix s w 2024-05-29 16:57:45 +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