Commit Graph

1319 Commits

Author SHA1 Message Date
lwl0608 d09d2242b0 Merge branch 'alipay_transfer_tip' into test 2024-08-06 11:40:06 +08:00
lwl0608 a2c9915525 withdarw sub msg 2024-08-06 11:40:02 +08:00
lwl0608 8a6de0408c Merge branch 'alipay_transfer_tip' into test 2024-08-06 11:31:50 +08:00
lwl0608 cce6f9976c add toast 2024-08-06 11:31:35 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
chenhao 0bbf0f301f Merge pull request '1' (#676) from feat-IRONFANS-176-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/676
2024-08-01 20:38:36 +08:00
Leufolium 191123ca64 1 2024-08-01 20:38:22 +08:00
chenhao 81e266e0b1 Merge pull request 'by Robin at 20240801' (#675) from feat-IRONFANS-185-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/675
2024-08-01 20:23:00 +08:00
Leufolium 71df61c5ff by Robin at 20240801 2024-08-01 20:22:48 +08:00
chenhao 8a376774e0 Merge pull request 'by Robin at 20240801' (#674) from feat-IRONFANS-185-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/674
2024-08-01 16:52:55 +08:00
Leufolium 0b2c83e215 by Robin at 20240801 2024-08-01 16:52:27 +08:00
chenhao 4876bb6ca8 Merge pull request 'by Robin at 20240801' (#673) from feat-IRONFANS-185-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/673
2024-08-01 16:22:05 +08:00
Leufolium 7ec3af4584 by Robin at 20240801 2024-08-01 16:21:48 +08:00
lwl0608 e9d57430b0 Merge branch 'add_ch' into test 2024-08-01 16:08:32 +08:00
lwl0608 739b1c6a6d chagne ch 2024-08-01 16:08:23 +08:00
lwl0608 e26f7180ea Merge branch 'add_ch' into test 2024-08-01 15:57:49 +08:00
lwl0608 855f39cfa8 fix 2024-08-01 15:57:40 +08:00
lwl0608 909bcb3b7f Merge branch 'add_ch' into test 2024-08-01 14:58:41 +08:00
lwl0608 bd240d08f3 fix 2024-08-01 14:58:37 +08:00
lwl0608 9bb54ffcb3 merge 2024-08-01 14:39:34 +08:00
lwl0608 d4f116de18 x 2024-08-01 14:38:55 +08:00
lwl0608 5f30544f99 fix ch 2024-08-01 14:38:55 +08:00
lwl0608 b5ae89028b merge 2024-08-01 14:06:39 +08:00
lwl0608 2103e5a723 ignore pay refund 2024-08-01 14:04:27 +08:00
lwl0608 f8a4c0fbe7 Merge branch 'add_raven' 2024-08-01 10:35:00 +08:00
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
chenhao 0a8005e7da Merge pull request '1' (#670) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/670
2024-07-31 21:59:54 +08:00
Leufolium b4e6c2532b 1 2024-07-31 21:59:39 +08:00
chenhao 25d67b2846 Merge pull request 'by Robin at 20240731' (#668) from BUG-20240731 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/668
2024-07-31 17:10:44 +08:00
Leufolium 2eb44b548f by Robin at 20240731 2024-07-31 17:10:28 +08:00
chenhao e132aeb8bf Merge pull request '1' (#667) from feat-IRONFANS-176-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/667
2024-07-31 16:50:59 +08:00
Leufolium bbb3f06e3a 1 2024-07-31 16:50:37 +08:00
lwl0608 170bf7af92 Merge branch 'add_raven' into test 2024-07-31 16:43:10 +08:00
lwl0608 6fd0d75f5c add lanxing 02 2024-07-31 16:43:03 +08:00
chenhao 6bafe7e390 Merge pull request 'by Robin at 20240731' (#666) from feat-IRONFANS-176-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/666
2024-07-31 16:09:06 +08:00
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
chenhao f6babbff70 Merge pull request '1' (#664) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/664
2024-07-31 15:58:29 +08:00
lwl0608 2091ac23c8 fix 2024-07-31 14:55:46 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
chenhao d24ed470b0 Merge pull request 'by Robin at 20240729' (#662) from BUG-20240729 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/662
2024-07-30 19:10:58 +08:00
Leufolium 44b37b1ad0 Merge branch 'feat-IRONFANS-176-Robin' into conflict 2024-07-30 18:58:16 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +08:00
chenhao 3d89cdb07c Merge pull request 'by Robin at 20240730; add delay' (#657) from feat-IRONFANS-166-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/657
2024-07-30 12:15:35 +08:00
Leufolium c6e1a41288 by Robin at 20240730; add delay 2024-07-30 12:15:01 +08:00
Leufolium 2e08c98384 1 2024-07-30 12:08:21 +08:00
lwl0608 e1d63b08d6 Merge branch 'add_raven' into test 2024-07-29 19:29:40 +08:00
lwl0608 739cc1dd11 fix outer raven 2024-07-29 19:29:34 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
lwl0608 940b5d7400 Merge branch 'add_raven' into test 2024-07-29 15:33:48 +08:00