Commit Graph

1218 Commits

Author SHA1 Message Date
chenhao ca89e8711a Merge pull request 'by Robin at 20240718' (#626) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/626
2024-07-18 19:31:19 +08:00
Leufolium b96a1eaefd by Robin at 20240718 2024-07-18 19:30:59 +08:00
chenhao 2978432789 Merge pull request '1' (#625) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/625
2024-07-17 18:32:31 +08:00
Leufolium 7c24f50709 1 2024-07-17 18:32:14 +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 c6aa6c3c53 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 18:02:30 +08:00
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
chenhao 4b023d0fc5 Merge pull request '1' (#622) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/622
2024-07-17 17:13:17 +08:00
chenhao e2ee45e1d1 Merge pull request 'by Robin at 20240717' (#621) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/621
2024-07-17 17:13:03 +08:00
Leufolium 7d22149037 1 2024-07-17 17:12:37 +08:00
Leufolium 441433e65c by Robin at 20240717 2024-07-17 17:10:04 +08:00
Leufolium 36f7b60923 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 13:00:51 +08:00
Leufolium 8fc078e3c9 by Robin at 20240717 2024-07-17 12:53:42 +08:00
Leufolium ca8536855c 1 2024-07-17 12:02:39 +08:00
Leufolium 9663b7121e by Robin at 20240717 2024-07-17 12:01:56 +08:00
Leufolium 88074a9b19 1 2024-07-17 08:44:26 +08:00
chenhao e0bcac5804 Merge pull request 'by Robin at 20240715' (#617) from BUG-20240715 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/617
2024-07-15 19:27:02 +08:00
Leufolium 08ddd0419b by Robin at 20240715 2024-07-15 19:26:47 +08:00
chenhao 395d72a4b6 Merge pull request '1' (#616) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/616
2024-07-15 18:17:13 +08:00
Leufolium 30542411c4 1 2024-07-15 18:12:20 +08:00
chenhao 1f4bf29eb2 Merge pull request 'feat-IRONFANS-163-Robin' (#615) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/615
2024-07-11 15:45:57 +08:00
Leufolium 3af5833d73 by Robin at 20240711 2024-07-11 15:43:23 +08:00
chenhao 13b1a9972f Merge pull request 'feat-IRONFANS-148-Robin' (#614) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/614
2024-07-11 15:38:45 +08:00
Leufolium f9924cb7cb 1 2024-07-11 15:37:39 +08:00
Leufolium b4418e23bb 1 2024-07-11 15:36:55 +08:00
lwl0608 7c510f0e3f Merge branch 'dev-lwl/add_alipay_clients' 2024-07-11 15:13:12 +08:00
Leufolium 2af8e89b0d 1 2024-07-11 15:07:10 +08:00
Leufolium b2b2f9df38 1 2024-07-11 15:01:02 +08:00
chenhao 2298b4f4e1 Merge pull request 'by Robin at 20240711' (#612) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/612
2024-07-11 14:56:00 +08:00
Leufolium f03f172a8d by Robin at 20240711 2024-07-11 14:53:43 +08:00
chenhao 2819f588f4 Merge pull request 'by Robin at 20240710' (#611) from feat-IRONFANS-157-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/611
2024-07-11 13:09:08 +08:00
lwl0608 ae43a7baa5 Merge branch 'dev-lwl/add_alipay_clients' into test 2024-07-11 11:17:17 +08:00
lwl0608 3bd6b9352d fix lanxing 02 2024-07-11 11:17:13 +08:00
Leufolium cd6b6de15b by Robin at 20240711 2024-07-11 11:10:25 +08:00
lwl0608 24ff2b0a75 fix 2024-07-11 10:04:10 +08:00
lwl0608 e3adc95d15 add random pay 2024-07-11 10:03:25 +08:00
chenhao eb9225fe36 Merge pull request 'by Robin at 20240711' (#609) from BUG-20240711 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/609
2024-07-11 08:15:01 +08:00
Leufolium 87fc79d62a by Robin at 20240711 2024-07-11 08:14:34 +08:00
Leufolium 89d3db64e3 Merge branch 'feat-IRONFANS-157-Robin' into conf 2024-07-10 05:50:35 +08:00
Leufolium e47ed25ed0 by Robin at 20240710 2024-07-10 05:47:56 +08:00
chenhao 75cf6fb68d Merge pull request 'by Robin at 20240710' (#605) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/605
2024-07-10 05:18:33 +08:00
Leufolium 739b47f032 by Robin at 20240710 2024-07-10 05:18:02 +08:00
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 4b3aef5cba Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-07-09 21:04:52 +08:00
Leufolium 8990758254 by Robin at 20240709 2024-07-09 21:02:18 +08:00
lwl0608 bfc5c9f810 black 2024-07-09 09:47:28 +08:00
lwl0608 f45ec3e11e fix 2024-07-08 02:00:53 +08:00
lwl0608 72d2521a3b fix 2024-07-08 01:56:50 +08:00