Commit Graph

136 Commits

Author SHA1 Message Date
lwl0608 3bfb560663 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 21:51:28 +08:00
lwl0608 c2973b553f add tiefanzone h5pay 2024-07-17 21:51:24 +08:00
lwl0608 6372e444a8 Merge branch 'dev-lwl/wx_tiefan' into test 2024-07-17 18:06:46 +08:00
lwl0608 2ecaa31ad2 add tiefanzone wxpay 2024-07-17 18:06:39 +08:00
Leufolium 65d5d4eb8a Merge branch 'test' of http://121.41.31.146:3000/wishpal_ironfan/service into test 2024-07-17 16:55:15 +08:00
Leufolium 09e1d11d56 1 2024-07-17 16:55:14 +08:00
chenhao ef971d5d70 Merge pull request 'by Robin at 20240717' (#619) from BUG-20240717 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/619
2024-07-17 14:18:59 +08:00
Leufolium a6798e71ff by Robin at 20240717 2024-07-17 14:18:41 +08:00
lwl0608 24ff2b0a75 fix 2024-07-11 10:04:10 +08:00
Leufolium 7900eed8d9 1 2024-07-04 13:34:52 +08:00
lwl0608 0dc67b4291 lanxing 01 2024-07-03 16:05:46 +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 8405d6f187 Merge remote-tracking branch 'origin/main' into conf 2024-07-01 18:00:36 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +08:00
Leufolium 408f786227 by Robin at 20240627 2024-06-27 18:42:33 +08:00
Leufolium 3a14b7a573 by Robin at 20240627 2024-06-27 14:21:46 +08:00
Leufolium 7bf51c7a87 Merge branch 'feat-IRONFANS-120-Robin' into conflict 2024-06-26 17:39:27 +08:00
Leufolium eedef90097 by Robin at 20240625 2024-06-25 21:18:12 +08:00
chenhao f7e6647b64 Merge pull request 'by Robin at 20240621' (#544) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/544
2024-06-21 18:26:21 +08:00
Leufolium 9ee568f858 by Robin at 20240621 2024-06-21 18:25:24 +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 6159759111 by Robin at 20240617 2024-06-17 22:25:43 +08:00
Leufolium 400cda2cc3 by Robin at 20240615 2024-06-15 13:41:03 +08:00
lwl0608 28d31a6500 fix refund 2024-06-14 18:39:52 +08:00
lwl0608 f6018b19d6 add yeepay cfg 2024-06-14 17:59:46 +08:00
lwl0608 d73163a37f merge 2024-06-14 17:58:43 +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
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
lwl0608 541c40ccc5 c 2024-06-03 10:43:14 +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
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
Leufolium d1dcf7a7e1 yeepay 2024-05-30 15:05:59 +08:00
Leufolium db090898a6 yeepay 2024-05-30 15:05:32 +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
Leufolium ecc1b941ca Merge remote-tracking branch 'origin/main' into conf 2024-05-27 16:39:45 +08:00
Leufolium 2c74eca4a8 by Robin at 20240527; offline etc 2024-05-27 16:38:19 +08:00
Leufolium 9308fbd796 by Robin 2024-05-24 08:38:58 +08:00