Commit Graph

1237 Commits

Author SHA1 Message Date
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
chenhao 3bb8ce050f Merge pull request 'mainconflict' (#672) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/672
2024-07-31 22:15:33 +08:00
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
Leufolium b4e6c2532b 1 2024-07-31 21:59:39 +08:00
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +08:00
Leufolium bbb3f06e3a 1 2024-07-31 16:50:37 +08:00
lwl0608 6fd0d75f5c add lanxing 02 2024-07-31 16:43:03 +08:00
Leufolium 70febfc421 by Robin at 20240731 2024-07-31 16:08:51 +08:00
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +08:00
lwl0608 96325994ea fix code 2024-07-31 14:55:16 +08:00
lwl0608 81ee19a92f add log 2024-07-31 14:33:59 +08:00
lwl0608 aa0794287a fix 2024-07-31 14:32:25 +08:00
chenhao 69566632ae Merge pull request 'by Robin at 20240730' (#663) from feat-IRONFANS-181-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/663
2024-07-30 19:12:31 +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
chenhao 9fe110c035 Merge pull request 'feat-IRONFANS-166-Robin' (#661) from feat-IRONFANS-166-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/661
2024-07-30 19:06:07 +08:00
Leufolium 7af7d2d6f1 by Robin at 20240730 2024-07-30 18:40:15 +08:00
Leufolium ef320f6b20 by Robin at 20240730 2024-07-30 15:36:58 +08:00
Leufolium d9ef34138b 1 2024-07-30 15:35:27 +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 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 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
Leufolium 5eeebd4206 by Robin at 20240729 2024-07-29 13:15:11 +08:00
lwl0608 af2b7c9d18 fix 2024-07-28 14:53:34 +08:00
lwl0608 ac2053db11 fix 2024-07-28 14:21:24 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
Leufolium 34bbcdf627 1 2024-07-25 21:37:50 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00
Leufolium 4caefe3025 1 2024-07-25 20:29:08 +08:00
Leufolium bb2c18fa4b 1 2024-07-25 20:11:38 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
lwl0608 53d7181cae change cdn 2024-07-24 19:16:03 +08:00
lwl0608 33e8d70e24 fix panic 2024-07-24 16:42:49 +08:00
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
chenhao 3cdc52c75e Merge pull request '修复json问题' (#647) from feat-IRONFANS-163-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/647
2024-07-23 22:21:13 +08:00
Leufolium 149901c2c9 修复json问题 2024-07-23 22:08:23 +08:00
Leufolium ef768c9129 1 2024-07-23 18:01:47 +08:00
Leufolium 56feffa1f2 Merge branch 'main' of http://121.41.31.146:3000/wishpal_ironfan/service 2024-07-23 17:52:40 +08:00
Leufolium efdf6aeafc 1 2024-07-23 17:52:39 +08:00
chenhao 4933a1517c Merge pull request '1' (#646) from mainconf into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/646
2024-07-23 17:50:11 +08:00
Leufolium d2ac79d076 1 2024-07-23 17:49:54 +08:00
chenhao 379bc6c82b Merge pull request 'mainconf' (#645) from mainconf into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/645
2024-07-23 17:45:10 +08:00
Leufolium b4bd78c501 2 2024-07-23 17:42:43 +08:00
Leufolium 9d7581b521 Merge remote-tracking branch 'origin/main' into mainconf 2024-07-23 17:41:08 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
Leufolium c5343564e3 1 2024-07-23 17:04:07 +08:00
Leufolium 24b52988f2 by Robin at 20240723 2024-07-23 16:37:16 +08:00