 Leufolium
|
883db65ea4
|
1
|
2024-07-09 21:54:04 +08:00 |
|
chenhao
|
91dd0d68eb
|
Merge pull request 'conflict' (#603) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/603
|
2024-07-09 21:05:50 +08:00 |
|
Leufolium
|
4b3aef5cba
|
Merge branch 'feat-IRONFANS-148-Robin' into conflict
|
2024-07-09 21:04:52 +08:00 |
|
Leufolium
|
8990758254
|
by Robin at 20240709
|
2024-07-09 21:02:18 +08:00 |
 lwl0608
|
bfc5c9f810
|
black
|
2024-07-09 09:47:28 +08:00 |
|
lwl0608
|
f45ec3e11e
|
fix
|
2024-07-08 02:00:53 +08:00 |
|
lwl0608
|
72d2521a3b
|
fix
|
2024-07-08 01:56:50 +08:00 |
|
chenhao
|
b5e5e891cf
|
Merge pull request '1' (#600) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/600
|
2024-07-05 16:59:54 +08:00 |
|
Leufolium
|
518b494873
|
1
|
2024-07-05 16:59:39 +08:00 |
|
chenhao
|
8356d54b3e
|
Merge pull request '1' (#599) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/599
|
2024-07-05 16:55:24 +08:00 |
|
Leufolium
|
cdcf23db57
|
1
|
2024-07-05 16:55:10 +08:00 |
|
chenhao
|
3077203546
|
Merge pull request 'by Robin at 20240705' (#598) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/598
|
2024-07-05 16:50:45 +08:00 |
|
Leufolium
|
080c9749b7
|
by Robin at 20240705
|
2024-07-05 16:50:29 +08:00 |
|
chenhao
|
adad3942a0
|
Merge pull request 'feat-IRONFANS-148-Robin' (#597) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/597
|
2024-07-05 16:48:13 +08:00 |
|
Leufolium
|
ffcd559825
|
by Robin at 20240705
|
2024-07-05 16:47:36 +08:00 |
|
Leufolium
|
c2567cbab4
|
by Robin at 20240705
|
2024-07-05 16:26:36 +08:00 |
|
lwl0608
|
8a13ba05de
|
Merge branch 'dev-lwl/add_withdraw_log' into test
|
2024-07-04 14:12:09 +08:00 |
|
lwl0608
|
655eb0368d
|
create order blacklist
|
2024-07-04 14:11:57 +08:00 |
|
Leufolium
|
7900eed8d9
|
1
|
2024-07-04 13:34:52 +08:00 |
|
lwl0608
|
425c0eddc9
|
优化 parse notify
|
2024-07-04 11:39:10 +08:00 |
|
chenhao
|
09d85318bd
|
Merge pull request 'conf' (#596) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/596
|
2024-07-04 10:09:35 +08:00 |
|
Leufolium
|
876c0ccfbc
|
Merge branch 'feat-IRONFANS-148-Robin' into conf
|
2024-07-04 10:08:28 +08:00 |
|
Leufolium
|
57d6fb8fdf
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin
|
2024-07-04 10:06:48 +08:00 |
|
Leufolium
|
f0f8eff7af
|
Merge remote-tracking branch 'origin/main' into test
|
2024-07-04 10:03:51 +08:00 |
|
Leufolium
|
3e2812dd15
|
by Robin at 20240704
|
2024-07-04 09:51:42 +08:00 |
|
Leufolium
|
eec64155c0
|
by Robin at 20240704
|
2024-07-04 09:34:42 +08:00 |
|
Leufolium
|
ee862c8a2d
|
by Robin at 20240704
|
2024-07-04 09:26:52 +08:00 |
|
chenhao
|
9a659d9b74
|
Merge pull request 'by Robin at 20240701' (#592) from feat-pay_add_token into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/592
|
2024-07-03 17:15:54 +08:00 |
|
chenhao
|
26c781fce7
|
Merge pull request 'feat-IRONFANS-139-Robin' (#591) from feat-IRONFANS-139-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/591
|
2024-07-03 16:54:02 +08:00 |
|
Leufolium
|
d33813ee61
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-139-Robin
|
2024-07-03 16:53:02 +08:00 |
|
Leufolium
|
8822343f44
|
by Robin at 20240703
|
2024-07-03 16:43:58 +08:00 |
|
Leufolium
|
6979bbc09f
|
by Robin at 20240703
|
2024-07-03 16:36:31 +08:00 |
|
lwl0608
|
0dc67b4291
|
lanxing 01
|
2024-07-03 16:05:46 +08:00 |
|
lwl0608
|
f75e9a9377
|
test xl01
|
2024-07-03 15:59:47 +08:00 |
|
lwl0608
|
661db0acc4
|
Merge branch 'dev-lwl/add_alipay_clients' into test
|
2024-07-03 15:59:33 +08:00 |
|
lwl0608
|
8702c44a2c
|
fix config
|
2024-07-03 15:59:27 +08:00 |
|
lwl0608
|
b035e3430f
|
Merge branch 'dev-lwl/add_alipay_clients' into test
|
2024-07-03 15:54:50 +08:00 |
|
lwl0608
|
6f6cf0c7cf
|
add xl01
|
2024-07-03 15:54:41 +08:00 |
|
chenhao
|
f77c42e45b
|
Merge pull request 'conflict' (#589) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/589
|
2024-07-03 15:16:02 +08:00 |
|
Leufolium
|
1323aef6db
|
Merge branch 'feat-IRONFANS-139-Robin' into conflict
|
2024-07-03 15:15:29 +08:00 |
|
chenhao
|
1fd9b886d1
|
Merge pull request 'main' (#587) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/587
|
2024-07-03 15:13:33 +08:00 |
|
Leufolium
|
551d420c3f
|
by Robin at 20240703
|
2024-07-03 15:13:04 +08:00 |
|
chenhao
|
688470d37a
|
Merge pull request 'feat-IRONFANS-160-Robin' (#586) from feat-IRONFANS-160-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/586
|
2024-07-02 21:12:59 +08:00 |
|
chenhao
|
963ae63c08
|
Merge pull request '1' (#585) from feat-IRONFANS-139-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/585
|
2024-07-02 19:57:58 +08:00 |
|
Leufolium
|
561df91f82
|
1
|
2024-07-02 19:57:28 +08:00 |
|
Leufolium
|
9585090251
|
Merge branch 'feat-IRONFANS-139-Robin' into test
|
2024-07-02 19:55:25 +08:00 |
|
Leufolium
|
0836a4baea
|
by Robin at 20240702
|
2024-07-02 19:53:29 +08:00 |
|
chenhao
|
1bdbf9d2f7
|
Merge pull request '1' (#583) from feat-IRONFANS-160-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/583
|
2024-07-02 18:42:53 +08:00 |
|
Leufolium
|
c022b0246a
|
1
|
2024-07-02 18:42:32 +08:00 |
|
chenhao
|
3f3dc87867
|
Merge pull request 'by Robin at 20240702' (#582) from feat-IRONFANS-160-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/582
|
2024-07-02 18:40:22 +08:00 |