Commit Graph

1830 Commits

Author SHA1 Message Date
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 4076be621a Merge pull request 'by Robin at 20240731' (#669) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/669
2024-07-31 17:10:57 +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
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +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 0566554519 Merge pull request 'by Robin at 20240731' (#665) from feat-IRONFANS-176-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/665
2024-07-31 15:58:42 +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
Leufolium dbda736b5d by Robin at 20240731 2024-07-31 15:55:59 +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
lwl0608 2df4baa5dc Merge branch 'add_refund_log' into test 2024-07-31 14:34:05 +08:00
lwl0608 81ee19a92f add log 2024-07-31 14:33:59 +08:00
lwl0608 87754b151b Merge branch 'add_refund_log' into test 2024-07-31 14:32:36 +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
chenhao 902faa8748 Merge pull request 'conflict' (#660) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/660
2024-07-30 18:58:33 +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
chenhao 2cc632574b Merge pull request 'by Robin at 20240730' (#658) from feat-IRONFANS-181-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/658
2024-07-30 15:40:27 +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
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
lwl0608 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
chenhao acf3e96a9d Merge pull request 'BUG-20240729' (#656) from BUG-20240729 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/656
2024-07-29 13:15:38 +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
chenhao a7f3d8f813 Merge pull request 'by Robin at 20240726' (#655) from feat-IRONFANS-166-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/655
2024-07-26 12:59:23 +08:00
Leufolium ae595246be by Robin at 20240726 2024-07-26 12:58:48 +08:00
chenhao 347717a4ae Merge pull request 'conf' (#654) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/654
2024-07-25 21:38:57 +08:00
Leufolium c2f89ac8e9 Merge branch 'feat-IRONFANS-166-Robin' into conf 2024-07-25 21:38:19 +08:00
Leufolium 34bbcdf627 1 2024-07-25 21:37:50 +08:00
chenhao 79bb224253 Merge pull request 'conf' (#651) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/651
2024-07-25 21:37:25 +08:00
Leufolium 6310092360 Merge remote-tracking branch 'origin/feat-IRONFANS-166-Robin' into conf 2024-07-25 21:37:08 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00