 lwl0608
|
a3a98587f3
|
merge
|
2024-08-14 11:02:26 +08:00 |
|
lwl0608
|
b6338fb391
|
search
|
2024-08-14 11:01:03 +08:00 |
 chenhao
|
ac4bebbf2a
|
Merge pull request 'feat-IRONFANS-191-Robin' (#694) from feat-IRONFANS-191-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/694
|
2024-08-08 18:01:50 +08:00 |
|
chenhao
|
566a86f002
|
Merge pull request 'by Robin at 20240808' (#693) from feat-IRONFANS-191-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/693
|
2024-08-08 18:01:37 +08:00 |
|
Leufolium
|
946c29b8c8
|
by Robin at 20240808
|
2024-08-08 18:00:22 +08:00 |
|
chenhao
|
1b2d0e1a03
|
Merge pull request 'by Robin at 20240808' (#690) from feat-IRONFANS-191-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/690
|
2024-08-08 16:05:20 +08:00 |
|
Leufolium
|
50d3ab3040
|
by Robin at 20240808
|
2024-08-08 16:04:50 +08:00 |
|
Leufolium
|
b34f197f6d
|
Merge branch 'feat-IRONFANS-186-Robin' into test
|
2024-08-07 22:24:22 +08:00 |
|
Leufolium
|
d33f3f212a
|
by Robin at 20240807
|
2024-08-07 22:22:32 +08:00 |
|
chenhao
|
99161f2de3
|
Merge pull request 'feat-IRONFANS-187-Robin' (#686) from feat-IRONFANS-187-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/686
|
2024-08-07 14:22:58 +08:00 |
|
lwl0608
|
03410ec251
|
Merge branch 'dev_remove_return_url' into test
|
2024-08-07 14:08:34 +08:00 |
|
lwl0608
|
3c1841d8d9
|
order from
|
2024-08-07 14:08:24 +08:00 |
|
Leufolium
|
ccc119277c
|
1
|
2024-08-06 18:16:56 +08:00 |
|
Leufolium
|
98f605c265
|
Merge branch 'feat-IRONFANS-176-Robin' into mainconf
|
2024-08-01 22:34:08 +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
|
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 |
|
Leufolium
|
73ada4aa6e
|
by Robin at 20240731
|
2024-07-31 17:04:08 +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 |
|
Leufolium
|
dbda736b5d
|
by Robin at 20240731
|
2024-07-31 15:55:59 +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 |
|
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 |
|
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 |
|
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
|
2ea3ebb6aa
|
by Robin at 20240725
|
2024-07-25 19:59:35 +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
|
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
|
9467b15d29
|
Merge branch 'feat-IRONFANS-163-Robin' into mainconf
|
2024-07-23 17:38:33 +08:00 |
|
Leufolium
|
f83058dc25
|
Merge branch 'feat-IRONFANS-148-Robin' into mainconf
|
2024-07-22 19:11:15 +08:00 |
|
chenhao
|
b87106fa8f
|
Merge pull request '1' (#637) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/637
|
2024-07-22 16:12:37 +08:00 |
|
Leufolium
|
6b800705c5
|
1
|
2024-07-22 16:12:22 +08:00 |
|
Leufolium
|
4540f29515
|
Merge branch 'feat-IRONFANS-173-Robin' into conflict
|
2024-07-22 16:02:15 +08:00 |
|
Leufolium
|
de7adf04e8
|
1
|
2024-07-22 15:57:56 +08:00 |
|
Leufolium
|
62efdad5c0
|
1
|
2024-07-22 13:45:57 +08:00 |
|
Leufolium
|
b283c34f44
|
by Robin at 20240722
|
2024-07-22 09:17:49 +08:00 |
|
Leufolium
|
2167befc4d
|
1
|
2024-07-19 18:31:15 +08:00 |
|
chenhao
|
2738a1393b
|
Merge pull request 'feat-IRONFANS-163-Robin' (#632) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/632
|
2024-07-19 18:12:01 +08:00 |