 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 |
|
chenhao
|
c137fd38bc
|
Merge pull request 'feat-IRONFANS-173-Robin' (#650) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/650
|
2024-07-25 20:28:48 +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
|
091a9b24a1
|
merg
|
2024-07-25 10:29:06 +08:00 |
|
lwl0608
|
cfdcc67c8f
|
fix ch
|
2024-07-25 10:28:43 +08:00 |
|
lwl0608
|
53d7181cae
|
change cdn
|
2024-07-24 19:16:03 +08:00 |
|
lwl0608
|
fc37a1595f
|
Merge branch 'fix_panicc' into test
|
2024-07-24 16:42:57 +08:00 |
|
lwl0608
|
33e8d70e24
|
fix panic
|
2024-07-24 16:42:49 +08:00 |
|
chenhao
|
ac6ee62ac6
|
Merge pull request 'By Robin at 20240724' (#649) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/649
|
2024-07-24 14:19:56 +08:00 |
|
chenhao
|
2f8ee103f4
|
Merge pull request 'main' (#648) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/648
|
2024-07-24 14:19:43 +08:00 |
|
Leufolium
|
433d3bbfa0
|
Merge branch 'main' into test
|
2024-07-24 14:19:28 +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 |