 lwl0608
|
f314affd2b
|
Merge branch 'dev-lwl/iap' into test
|
2024-06-14 10:26:10 +08:00 |
|
lwl0608
|
67f144144f
|
fix
|
2024-06-14 10:26:00 +08:00 |
|
lwl0608
|
064300871b
|
fix
|
2024-06-14 10:20:08 +08:00 |
|
lwl0608
|
ebefdb66f0
|
Merge branch 'dev-lwl/iap' into test
|
2024-06-13 20:54:14 +08:00 |
|
lwl0608
|
30f18cf601
|
fx
|
2024-06-13 20:54:06 +08:00 |
|
lwl0608
|
d28f58a733
|
f
|
2024-06-13 16:43:31 +08:00 |
|
lwl0608
|
571a961151
|
apple
|
2024-06-13 16:40:22 +08:00 |
|
lwl0608
|
056fbabd14
|
proto
|
2024-06-12 23:45:03 +08:00 |
|
lwl0608
|
7df284d010
|
f
|
2024-06-09 00:02:37 +08:00 |
|
lwl0608
|
39ddeb698b
|
merge
|
2024-06-04 17:46:47 +08:00 |
|
lwl0608
|
8bf8e9357f
|
create order. add paytype: coin
|
2024-06-04 17:44:06 +08:00 |
 chenhao
|
906f8ca05c
|
Merge pull request 'by Robin at 20240530' (#519) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/519
|
2024-05-30 15:24:11 +08:00 |
|
Leufolium
|
a6e3a3ee12
|
by Robin at 20240530
|
2024-05-30 15:23:40 +08:00 |
|
lwl0608
|
1a4140c32a
|
Merge branch 'dev-lwl/yop' into test
|
2024-05-30 11:10:03 +08:00 |
|
lwl0608
|
dcf2057a86
|
redirect url
|
2024-05-30 11:09:59 +08:00 |
|
lwl0608
|
b02fe65dd6
|
Merge branch 'dev-lwl/fix_unlock_superfan' into test
|
2024-05-29 15:26:31 +08:00 |
|
lwl0608
|
6d1e62324e
|
manual unlock wechat
|
2024-05-29 15:26:24 +08:00 |
|
Leufolium
|
690a5b31f6
|
Merge remote-tracking branch 'origin/main' into feat-IRONFANS-125-Robin
|
2024-05-28 13:11:21 +08:00 |
|
lwl0608
|
ad7dd3b052
|
Merge branch 'dev-lwl/yop' into test
|
2024-05-27 19:37:58 +08:00 |
|
lwl0608
|
fe3cb342d6
|
fix yeepay callback
|
2024-05-27 19:37:52 +08:00 |
|
lwl0608
|
99cd5896a0
|
merge
|
2024-05-27 16:54:34 +08:00 |
|
lwl0608
|
f34bf3670e
|
yop
|
2024-05-27 16:48:25 +08:00 |
|
chenhao
|
2ff7822af8
|
Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
|
2024-05-27 16:28:00 +08:00 |
|
Leufolium
|
b8a9b7e66b
|
by Robin at 20240524
|
2024-05-24 04:09:24 +08:00 |
|
Leufolium
|
e3a91eed7a
|
by Robin at 20240524
|
2024-05-24 04:08:43 +08:00 |
|
Leufolium
|
b221fa7bfb
|
Merge branch 'feat-IRONFANS-133-Robin' into conflict
|
2024-05-24 03:55:36 +08:00 |
|
Leufolium
|
c2c8125b5f
|
by
|
2024-05-24 03:52:57 +08:00 |
|
chenhao
|
31ac9a3b98
|
revert 4f67673057
revert by Robin at 20240524
|
2024-05-24 03:32:04 +08:00 |
|
Leufolium
|
4f67673057
|
by Robin at 20240524
|
2024-05-24 03:18:12 +08:00 |
|
Leufolium
|
63ba534b6e
|
by Robin at 20240523
|
2024-05-23 04:10:10 +08:00 |
|
chenhao
|
7867bdb3a8
|
Merge pull request 'by Robin at 20240522' (#472) from feat-IRONFANS-118-Robin-2 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/472
|
2024-05-22 23:20:50 +08:00 |
|
Leufolium
|
a7e01c4dec
|
by Robin at 20240522
|
2024-05-22 23:20:27 +08:00 |
|
Leufolium
|
58229ca3d1
|
by Robin at 20240522; separtaion of offline and online services
|
2024-05-22 17:14:20 +08:00 |
|
chenhao
|
320792b4fe
|
Merge pull request 'by' (#470) from feat-IRONFANS-118-Robin-2 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/470
|
2024-05-21 23:31:26 +08:00 |
|
Leufolium
|
5247912764
|
by
|
2024-05-21 23:31:10 +08:00 |
|
Leufolium
|
0a287ebbfc
|
by Robin at 20240521
|
2024-05-21 23:19:08 +08:00 |
|
Leufolium
|
acb3e2fc24
|
Merge branch 'conf' of http://121.41.31.146:3000/wishpal_ironfan/service into conf
|
2024-05-21 23:16:20 +08:00 |
|
Leufolium
|
5cd103dac2
|
Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin-2' into conf
|
2024-05-21 23:15:47 +08:00 |
|
Leufolium
|
b8b228eb02
|
by Robin at 20240521
|
2024-05-21 23:12:25 +08:00 |
|
chenhao
|
36338ff2e8
|
by Robin at 20240521
|
2024-05-21 23:11:45 +08:00 |
|
chenhao
|
3ff0b4ed87
|
by Robin at 20240516
|
2024-05-21 23:06:48 +08:00 |
|
Leufolium
|
7c76dc449c
|
by robin at 20240521
|
2024-05-21 23:06:30 +08:00 |
|
chenhao
|
fbfaa11a0b
|
Merge pull request 'by Robin at 20240521' (#464) from feat-IRONFANS-125-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/464
|
2024-05-21 22:13:27 +08:00 |
|
Leufolium
|
1d2d8b1cc5
|
by Robin at 20240521
|
2024-05-21 22:12:59 +08:00 |
|
Leufolium
|
6dc26aeb1b
|
Merge remote-tracking branch 'origin/main' into test
|
2024-05-20 15:31:38 +08:00 |
|
chenhao
|
568d7661f7
|
Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
|
2024-05-18 00:34:39 +08:00 |
|
Leufolium
|
6ff619e386
|
1
|
2024-05-18 00:34:20 +08:00 |
|
chenhao
|
73be110ca6
|
Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
|
2024-05-18 00:13:38 +08:00 |
|
Leufolium
|
853d231a9f
|
by Robin at 20240518
|
2024-05-18 00:12:54 +08:00 |
|
Leufolium
|
d089f30fb4
|
Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517
|
2024-05-17 16:17:46 +08:00 |